]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9fa8aec) | patch
cherry-pick: do not give irrelevant advice when cherry-pick punted
authorJay Soffian <jaysoffian@gmail.com>
Thu, 6 Oct 2011 17:58:01 +0000 (13:58 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 23:56:49 +0000 (16:56 -0700)
commit82352cb633f30fef9dd837235c328890da12930e
tree7fcf31db93a380181cf43f66e76afc585011bab9tree | snapshot
parent9fa8aecdebf6339ad4f897ee45f36192fd75325ecommit | diff
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>
builtin/revert.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.