summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@gmail.com>2006-12-07 06:36:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-19 00:05:08 (GMT)
commit910c00c8ca4d998edb318cc232c03ec855cfa161 (patch)
tree0775b03cc0e1590eec723888211c9373fde6810d
parent38c594d3300b7640532a3716adf5a0778021542c (diff)
downloadgit-910c00c8ca4d998edb318cc232c03ec855cfa161.zip
git-910c00c8ca4d998edb318cc232c03ec855cfa161.tar.gz
git-910c00c8ca4d998edb318cc232c03ec855cfa161.tar.bz2
Add config example with respect to branch
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>
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ceac54b..22482d6 100644
--- 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
~~~~~~~~~