diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:51 -0700 |
| commit | be57695d77c4303798796510585618c57e1bba63 (patch) | |
| tree | 820d05e7347393aeed8365e37cb62ec4ada5836d /git-merge-resolve.sh | |
| parent | Merge branch 'jc/maint-rev-list-culled-boundary' into maint (diff) | |
| parent | Rename core.abbrevlength back to core.abbrev (diff) | |
| download | tgif-be57695d77c4303798796510585618c57e1bba63.tar.xz | |
Merge branch 'lt/default-abbrev' into maint
* lt/default-abbrev:
Rename core.abbrevlength back to core.abbrev
Make the default abbrev length configurable
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions