diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:12 -0700 |
| commit | a1ee40f3a2c626ad2b66e9fadf9a4064c3c5118c (patch) | |
| tree | 18cfc2f3bb0537e52a6bb8ce04a68566bd6db3f0 /merge-file.c | |
| parent | Merge branch 'jc/maint-reset-unmerged-path' into maint (diff) | |
| parent | Merge commit 'v1.7.6' into jc/checkout-reflog-fix (diff) | |
| download | tgif-a1ee40f3a2c626ad2b66e9fadf9a4064c3c5118c.tar.xz | |
Merge branch 'jc/checkout-reflog-fix' into maint
* jc/checkout-reflog-fix:
checkout: do not write bogus reflog entry out
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions