Skip to content

Commit

Permalink
Add config example with respect to branch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Aneesh Kumar K.V authored and Junio C Hamano committed Dec 19, 2006
1 parent 38c594d commit 910c00c
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ Example
external = "/usr/local/bin/gnu-diff -u"
renames = true

[branch "devel"]
remote = origin
merge = refs/heads/devel


Variables
~~~~~~~~~

Expand Down

0 comments on commit 910c00c

Please sign in to comment.