gitmirror / git fork watch download tarball
public this repo is viewable by everyone
Description: GitHub mirror of the publicly available git repo, updated hourly. It's here so we can use the collaboration tools of GitHub. Updates ONLY from git public repo. If you want changes pulled, contact the git team, not me.
Clone URL: git://github.com/gitmirror/git.git 
Documentation/config.txt: Mention branch.<name>.rebase applies to 
"git pull"

Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
dustin (author)
6 days ago
Junio C Hamano (committer)
6 days ago
commit  15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371
tree    24dee11461863877f6f32ca9e95cf9192ff86c8c
parent  afd899e1b7ef2b55a24834faad228b45ded6320a
Documentation/config.txt 
...
362
363
364
365
 
 
366
367
368
 
...
362
363
364
 
365
366
367
368
369
 
0
@@ -362,7 +362,8 @@ branch.<name>.mergeoptions::
0
 
0
 branch.<name>.rebase::
0
   When true, rebase the branch <name> on top of the fetched branch,
0
-  instead of merging the default branch from the default remote.
0
+  instead of merging the default branch from the default remote when
0
+  "git pull" is run.
0
   *NOTE*: this is a possibly dangerous operation; do *not* use
0
   it unless you understand the implications (see linkgit:git-rebase[1]
0
   for details).

Comments

    No one has commented yet.