summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-11-28 13:11:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-29 01:32:23 (GMT)
commitcd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5 (patch)
treeab9ba5875d21a8a506d910f2dafbdb3f35787efa /Documentation/config.txt
parentd25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (diff)
downloadgit-cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5.zip
git-cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5.tar.gz
git-cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5.tar.bz2
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 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 39d1ef5..4124ad2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -346,6 +346,13 @@ branch.<name>.mergeoptions::
option values containing whitespace characters are currently not
supported.
+branch.<name>.rebase::
+ When true, rebase the branch <name> on top of the fetched branch,
+ instead of merging the default branch from the default remote.
+ *NOTE*: this is a possibly dangerous operation; do *not* use
+ it unless you understand the implications (see gitlink:git-rebase[1]
+ for details).
+
clean.requireForce::
A boolean to make git-clean do nothing unless given -f
or -n. Defaults to true.