summaryrefslogtreecommitdiff
path: root/builtin-diff-index.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2007-11-28 13:11:07 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-28 17:32:23 -0800
commitcd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5 (patch)
treeab9ba5875d21a8a506d910f2dafbdb3f35787efa /builtin-diff-index.c
parentMerge branch 'maint' (diff)
downloadtgif-cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5.tar.xz
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>
Diffstat (limited to 'builtin-diff-index.c')
0 files changed, 0 insertions, 0 deletions