diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-15 18:59:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-15 18:59:04 -0700 |
| commit | fab600ce2ed086ba87499ffe3c35c46f85e7ab61 (patch) | |
| tree | ee50aef079f3aaeb9094cf3bb70a545fe809cb4c /Documentation/git-merge.txt | |
| parent | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" (diff) | |
| parent | Add pretty format %aN which gives the author name, respecting .mailmap (diff) | |
| download | tgif-fab600ce2ed086ba87499ffe3c35c46f85e7ab61.tar.xz | |
Merge branch 'js/maint-pretty-mailmap'
* js/maint-pretty-mailmap:
Add pretty format %aN which gives the author name, respecting .mailmap
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions