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 /builtin/mailsplit.c | |
| parent | 9fa8aecdebf6339ad4f897ee45f36192fd75325e (diff) | |
| download | git-82352cb633f30fef9dd837235c328890da12930e.tar.gz | |
cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-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 'builtin/mailsplit.c')
0 files changed, 0 insertions, 0 deletions