Code

Allow tracking branches to set up rebase by default.
authorDustin Sallings <dustin@spy.net>
Sat, 10 May 2008 22:36:29 +0000 (15:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 11 May 2008 16:28:52 +0000 (09:28 -0700)
commitc998ae9baa1cc5f507646da9850731de634d2ee7
tree0df6f1a71d2a6e5de4737c4ea784d67cdd760340
parentd1a8d0ea5fb2d4d43d0ea8f2fe45ec1fce7ec4bc
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>
Documentation/config.txt
branch.c
cache.h
config.c
environment.c
t/t3200-branch.sh