diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:14:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:14:47 -0800 |
| commit | cdcd79321390b41df452c48c5ba9d1e4cc23a801 (patch) | |
| tree | fdabf705a77dee66f21cc340558d6c0e6aa8899d /git-mergetool.sh | |
| parent | Merge branch 'rs/lock-correct-ref-during-delete' into maint (diff) | |
| parent | commit: fixup misplacement of --no-post-rewrite description (diff) | |
| download | tgif-cdcd79321390b41df452c48c5ba9d1e4cc23a801.tar.xz | |
Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint
* as/maint-doc-fix-no-post-rewrite:
commit: fixup misplacement of --no-post-rewrite description
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions