summaryrefslogtreecommitdiff
path: root/combine-diff.c
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 /combine-diff.c
parenta452d148d10a89ae502bc4755c191ab323227ce5 (diff)
parentb792c067872a6b4ec6545dc4375a7084626cb0fa (diff)
downloadgit-1b76df16d1e0f819af4e4766f7f621568571fd9f.tar.gz
Merge branch 'nk/branch-v-abbrev'
* nk/branch-v-abbrev: branch -v: honor core.abbrev
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions