summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9902387)
raw | patch | inline | side by side (parent: 9902387)
author | James Bowes <jbowes@dangerouslyinc.com> | |
Wed, 23 May 2007 22:16:12 +0000 (18:16 -0400) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 24 May 2007 00:48:42 +0000 (17:48 -0700) |
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/config.txt | patch | blob | history |
index 6593f2e93709c19ef6808dbfd235ca43b23c388d..65ed64a45744aa1a05615730910f8e5de2bbe933 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
as the '--whitespace' option. See gitlink:git-apply[1].
branch.autosetupmerge::
- Tells `git-branch' and `git-checkout' to setup new branches
+ 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`