diff options
| author |  Jay Soffian <jaysoffian@gmail.com> | 2011-10-06 13:58:01 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-06 16:56:49 -0700 |
| commit | 82352cb633f30fef9dd837235c328890da12930e (patch) | |
| tree | 7fcf31db93a380181cf43f66e76afc585011bab9 /csum-file.c | |
| parent | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so (diff) | |
| download | tgif-82352cb633f30fef9dd837235c328890da12930e.tar.xz | |
cherry-pick: do not give irrelevant advice when cherry-pick punted
If a cherry-pick did not even start because the working tree had local
changes that would overlap with the operation, we shouldn't be advising
the users to resolve conflicts nor to conclude it with "git commit".
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions