diff options
author | Dustin Sallings <dustin@spy.net> | 2008-05-10 15:36:29 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-12 17:16:40 -0700 |
commit | 0a02186f924aee1bd69f18ed01f645aa332ce0d1 (patch) | |
tree | 039f2f5fa6c73383542d3628ba4c0cc2e22d83fc /fsck.c | |
parent | Merge branch 'maint' (diff) | |
download | tgif-0a02186f924aee1bd69f18ed01f645aa332ce0d1.tar.xz |
Allow tracking branches to set up rebase by default.
Change cd67e4d4 introduced a new configuration parameter that told
pull to automatically perform a rebase instead of a merge. This
change provides a configuration option to enable this feature
automatically when creating a new branch.
If the variable branch.autosetuprebase applies for a branch that's
being created, that branch will have branch.<name>.rebase set to true.
Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fsck.c')
0 files changed, 0 insertions, 0 deletions