From: Beat Bolli Date: Sat, 18 Aug 2012 09:07:31 GMT Subject: [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing Message-ID: <1345280851-6626-2-git-send-email-bbolli@ewanet.ch> In-Reply-To: <1345280851-6626-1-git-send-email-bbolli@ewanet.ch> 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 --- git-gui/lib/commit.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 78c5eeb..864b687 100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/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. # -- 1.7.10.4