projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8dd60f5) | patch
gitk: Update cherry-pick error message parsing
authorAnders Kaseorg <andersk@MIT.EDU>
Wed, 19 Jan 2011 19:45:00 +0000 (14:45 -0500)
committerPaul Mackerras <paulus@samba.org>
Sat, 9 Apr 2011 12:19:38 +0000 (22:19 +1000)
commitb74307f6a551d50e9b1aa121a326d32ff1827a93
treed7b04a51e34481d26f9fd8418038fa539d8a0e22tree | snapshot
parent8dd60f5401c6ccfb69de5e8f76c55fa9e92edae5commit | diff
gitk: Update cherry-pick error message parsing

Commit 981ff5c37ae20687c98d98c8689d5e89016026d2 changed the error
message from git cherry-pick from
    Automatic cherry-pick failed.  [...advice...]
to
    error: could not apply 7ab78c9... Do something neat.
    [...advice...]

Update gitk’s regex to match this, restoring the ability to launch git
citool to resolve conflicted cherry-picks.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk diff | blob | history
Git—the stupid content tracker