| commit | 0a02186f924aee1bd69f18ed01f645aa332ce0d1 | |
| author | Dustin Sallings <dustin@spy.net> | |
| Sat, 10 May 2008 22:36:29 +0000 (10 15:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 May 2008 00:16:40 +0000 (12 17:16 -0700) | ||
| tree | 039f2f5fa6c73383542d3628ba4c0cc2e22d83fc | treesnapshot (tar.gz zip) |
| parent | 1f8115b113def8ee03701aa87b26c5e8b7c94434 | commitdiff |
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>
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>