diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-08 21:37:09 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-08 21:37:09 +1100 |
| commit | 887a791f113a09a56bb4916243463481a51d86a4 (patch) | |
| tree | ec686d8c69e879c8eec1b45b8ef43f1ad8e885dd /builtin/commit-tree.c | |
| parent | gitk: Make cherry-pick call git-citool on conflicts (diff) | |
| download | git-887a791f113a09a56bb4916243463481a51d86a4.tar.gz git-887a791f113a09a56bb4916243463481a51d86a4.zip | |
gitk: Improve cherry-pick error handling
This adds to the regexps that are used to work out what sort of error
we encountered in trying to do a cherry-pick so that it recognizes
some additional common error messages. It adds a confirmation dialog
when the error is a merge conflict so the user can choose whether or
not to run git citool. Finally, it arranges to update the display
after a cherry-pick failed so that any local changes made by the
cherry-pick become visible.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions