aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-28 21:15:33 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-28 21:15:33 -0700
commit1b76df16d1e0f819af4e4766f7f621568571fd9f (patch)
tree69c3c1dc794b7b13c0a0b6f1036afbb62774a36b /Documentation
parenta452d148d10a89ae502bc4755c191ab323227ce5 (diff)
parentb792c067872a6b4ec6545dc4375a7084626cb0fa (diff)
downloadgit-1b76df16d1e0f819af4e4766f7f621568571fd9f.tar.gz
git-1b76df16d1e0f819af4e4766f7f621568571fd9f.tar.xz
Merge branch 'nk/branch-v-abbrev'
* nk/branch-v-abbrev: branch -v: honor core.abbrev
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index c50f18982..507b8d0ab 100644
--- 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.