Merge branch 'nk/branch-v-abbrev'

* nk/branch-v-abbrev: branch -v: honor core.abbrev
2011-08-28 21:15:33 -07:00
parent a452d148d1 b792c06787
commit 1b76df16d1
2 changed files with 6 additions and 2 deletions
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@ -113,7 +113,8 @@ OPTIONS

 --abbrev=<length>::
 	Alter the sha1's minimum display length in the output listing.
-	The default value is 7.
+	The default value is 7 and can be overridden by the `core.abbrev`
+	config option.

 --no-abbrev::
 	Display the full sha1s in the output listing rather than abbreviating them.