Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Document branch.autosetupmerge.
author
Paolo Bonzini
<paolo.bonzini@lu.unisi.ch>
Wed, 23 May 2007 05:07:54 +0000
(07:07 +0200)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 23 May 2007 05:42:42 +0000
(22:42 -0700)
This patch documents the branch.autosetupmerge config option, added
by commit
0746d19a
.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/config.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
0ba956d
)
diff --git
a/Documentation/config.txt
b/Documentation/config.txt
index c3fc64acc756e6ecbc7fd8fd27362cb5e0ea2fef..6593f2e93709c19ef6808dbfd235ca43b23c388d 100644
(file)
--- a/
Documentation/config.txt
+++ b/
Documentation/config.txt
@@
-287,6
+287,13
@@
apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
as the '--whitespace' option. See gitlink:git-apply[1].
Tells `git-apply` how to handle whitespaces, in the same way
as the '--whitespace' option. See gitlink:git-apply[1].
+branch.autosetupmerge::
+ Tells `git-branch' and `git-checkout' to setup new branches
+ so that gitlink:git-pull[1] will appropriately merge from that
+ remote branch. Note that even if this option is not set,
+ this behavior can be chosen per-branch using the `--track`
+ and `--no-track` options. This option defaults to false.
+
branch.<name>.remote::
When in branch <name>, it tells `git fetch` which remote to fetch.
If this option is not given, `git fetch` defaults to remote "origin".
branch.<name>.remote::
When in branch <name>, it tells `git fetch` which remote to fetch.
If this option is not given, `git fetch` defaults to remote "origin".