diff options
author | Aneesh Kumar K.V <aneesh.kumar@gmail.com> | 2006-12-07 09:36:55 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-19 03:05:08 +0300 |
commit | 910c00c8ca4d998edb318cc232c03ec855cfa161 (patch) | |
tree | 0775b03cc0e1590eec723888211c9373fde6810d /Documentation/config.txt | |
parent | 38c594d3300b7640532a3716adf5a0778021542c (diff) |
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>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ceac54b024..22482d6a94 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 ~~~~~~~~~ |