From: Aneesh Kumar K.V Date: Thu, 7 Dec 2006 06:36:55 +0000 (+0530) Subject: Add config example with respect to branch X-Git-Tag: v1.5.0-rc0~69 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=910c00c8ca4d998edb318cc232c03ec855cfa161;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index ceac54b02..22482d6a9 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 ~~~~~~~~~