diff options
| author |  Dustin Sallings <dustin@spy.net> | 2008-05-10 15:36:29 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-11 09:28:52 -0700 |
| commit | c998ae9baa1cc5f507646da9850731de634d2ee7 (patch) | |
| tree | 0df6f1a71d2a6e5de4737c4ea784d67cdd760340 /git-parse-remote.sh | |
| parent | git-svn: fix cloning of HTTP URLs with '+' in their path (diff) | |
| download | tgif-c998ae9baa1cc5f507646da9850731de634d2ee7.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 'git-parse-remote.sh')
0 files changed, 0 insertions, 0 deletions