projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
38c594d
)
Add config example with respect to branch
author
Aneesh Kumar K.V
<aneesh.kumar@gmail.com>
Thu, 7 Dec 2006 06:36:55 +0000
(12:06 +0530)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 19 Dec 2006 00:05:08 +0000
(16:05 -0800)
Update config.txt with example with respect to branch
config variable. This give a better idea regarding
how branch names are expected.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/config.txt
patch
|
blob
|
history
diff --git
a/Documentation/config.txt
b/Documentation/config.txt
index ceac54b024bd407f3c3d3079f6164b3d61401da3..22482d6a94e88544935eee5f560089b9a4bf0dfa 100644
(file)
--- a/
Documentation/config.txt
+++ b/
Documentation/config.txt
@@
-31,6
+31,11
@@
Example
external = "/usr/local/bin/gnu-diff -u"
renames = true
+ [branch "devel"]
+ remote = origin
+ merge = refs/heads/devel
+
+
Variables
~~~~~~~~~