git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 84a76f1)
gitk: Make cherry-pick call git-citool on conflicts
authorAlexander Gavrilov <redacted>
Sun, 2 Nov 2008 18:59:47 +0000 (21:59 +0300)
committerPaul Mackerras <redacted>
Fri, 7 Nov 2008 11:53:17 +0000 (22:53 +1100)
commit15e350552db1c0e8ede0af4f1f07dbbc9090e420
tree12cda3cd4a56254686ca32a511312cd22eadc59ftree | snapshot
parent84a76f18f0313832ccc9c2f0171ace3da64ffa4fcommit | diff
gitk: Make cherry-pick call git-citool on conflicts

Now that git-gui has facilities to help users resolve
conflicts, it makes sense to launch it from other GUI
tools when they happen.

Signed-off-by: Alexander Gavrilov <redacted>
Signed-off-by: Paul Mackerras <redacted>
gitk diff | blob | history
git clone https://git.99rst.org/PROJECT