author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Wed, 28 Nov 2007 13:11:07 +0000 (13:11 +0000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 29 Nov 2007 01:32:23 +0000 (17:32 -0800) | ||
commit | cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5 | |
tree | ab9ba5875d21a8a506d910f2dafbdb3f35787efa | tree | snapshot |
parent | d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 | commit | diff |
Teach 'git pull' about --rebase
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.<name>.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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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.<name>.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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt | diff | blob | history | |
Documentation/git-pull.txt | diff | blob | history | |
git-pull.sh | diff | blob | history | |
t/t5520-pull.sh | diff | blob | history |