diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-06 17:02:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-06 17:02:11 -0700 |
| commit | 278f7e6f6dc1b515f192daf836fe75d733435774 (patch) | |
| tree | 8e8f5b613e47929f4e44d8c963bfa34ff4b026a6 /diffcore-rename.c | |
| parent | Post 1.7.7 first wave (diff) | |
| parent | cherry-pick: do not give irrelevant advice when cherry-pick punted (diff) | |
| download | tgif-278f7e6f6dc1b515f192daf836fe75d733435774.tar.xz | |
Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted
* js/maint-no-cherry-pick-head-after-punted:
cherry-pick: do not give irrelevant advice when cherry-pick punted
revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
Conflicts:
builtin/revert.c
Diffstat (limited to 'diffcore-rename.c')
0 files changed, 0 insertions, 0 deletions