diff options
| author | Beat Bolli <bbolli@ewanet.ch> | 2012-08-18 13:28:00 -0700 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2012-09-17 11:59:05 +0100 |
| commit | 5a5e4d2599faf51240e5c8f29645eeb2aedff5c2 (patch) | |
| tree | 285ce9e0ff8f2e59e315843de5eae31a34d26378 | |
| parent | 9ef750875abd9cc41d733131a2851b5165fc2197 (diff) | |
| download | git-5a5e4d2599faf51240e5c8f29645eeb2aedff5c2.tar.gz | |
git-gui: remove .git/CHERRY_PICK_HEAD after committing
Adding _git_ps1() to one's bash prompt displays various repo status
info after each command. After committing a git cherry-pick -n using
git-gui, the prompt still contains the "|CHERRY-PICKING" flag.
Delete the file causing this flag when cleaning up.
Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| -rw-r--r-- | lib/commit.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 78c5eeb7bc..864b687057 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -409,6 +409,7 @@ A rescan will be automatically started now. catch {file delete [gitdir MERGE_MSG]} catch {file delete [gitdir SQUASH_MSG]} catch {file delete [gitdir GITGUI_MSG]} + catch {file delete [gitdir CHERRY_PICK_HEAD]} # -- Let rerere do its thing. # |