git/git-pull.sh, branch v1.5.6.4

pull --rebase: exit early when the working directory is dirty

2008-05-23T06:05:11Z

When rebasing fails during "pull --rebase", you cannot just clean up the working directory and call "pull --rebase" again, since the remote branch was already fetched. Therefore, die early when the working directory is dirty. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

merge, pull: add '--(no-)log' command line option

2008-04-13T02:28:18Z

These are the command line option equivalents of the 'merge.log' config variable. The patch also updates documentation and bash completion accordingly, and adds a test. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

merge, pull: introduce '--(no-)stat' option

2008-04-13T02:28:18Z

This option has the same effect as '--(no-)summary' (i.e. whether to show a diffsat at the end of the merge or not), and it is consistent with the '--stat' option of other git commands. Documentation, tests, and bash completion are updaed accordingly, and the old --summary option is marked as being deprected. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

pull: pass --strategy along to to rebase

2008-02-23T05:44:46Z

rebase supports --strategy, so pull should pass the option along to it. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

pull --rebase: be cleverer with rebased upstream branches

2008-01-27T02:24:24Z

When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

"git pull --tags": error out with a better message.

2007-12-29T05:01:24Z

When "git pull --tags" is run without any other arguments, the standard error message "You told me to fetch and merge stuff but there is nothing to merge! You might want to fix your config" is given. While the error may be technically correct, fixing the config would not help, as "git pull --tags" itself tells "git fetch" not to use the configured refspecs. This commit makes "git pull --tags" to issue a different error message to avoid confusion. This is merely an interim solution. In the longer term, it would be a better approach to change the semantics of --tags option to make "git fetch" and "git pull" to: (1) behave as if no --tags was given (so an explicit refspec on the command line overrides configured ones, or no explicit refspecs on the command line takes configured ones); but (2) no auto-following of tags is made even when using configured refspecs; and (3) fetch all tags as not-for-merge entries". Then we would not need to have this separate error message, as the ordinary merge will happen even with the --tags option. Signed-off-by: Junio C Hamano

Teach 'git pull' about --rebase

2007-11-29T01:32:23Z

When calling 'git pull' with the '--rebase' option, it performs a fetch + rebase instead of a fetch + merge. This behavior is more desirable than fetch + pull when a topic branch is ready to be submitted and needs to be update. fetch + rebase might also be considered a better workflow with shared repositories in any case, or for contributors to a centrally managed repository, such as WINE's. As a convenience, you can set the default behavior for a branch by defining the config variable branch..rebase, which is interpreted as a bool. This setting can be overridden on the command line by --rebase and --no-rebase. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

scripts: Add placeholders for OPTIONS_SPEC

2007-11-06T09:50:02Z

--text follows this line-- These commands currently lack OPTIONS_SPEC; allow people to easily list with "git grep 'OPTIONS_SPEC=$'" what they can help improving. Signed-off-by: Junio C Hamano

Teach git-pull about --[no-]ff, --no-squash and --commit

2007-10-29T20:32:52Z

These options are supported by git-merge, but git-pull didn't know about them. Signed-off-by: Lars Hjemli Signed-off-by: Junio C Hamano

Make git-pull complain and give advice when there is nothing to merge with

2007-10-03T00:27:48Z

Signed-off-by: Federico Mena Quintero Signed-off-by: Junio C Hamano