From: Bert Wesarg Date: Sat, 22 Oct 2011 19:39:40 GMT Subject: [PATCH 2/2] git-gui: don't warn for detached head when rebasing Message-ID: In-Reply-To: <0f4995b5df707782c73ec83171fb2f512ae887ef.1319312280.git.bert.wesarg@googlemail.com> Signed-off-by: Bert Wesarg --- lib/commit.tcl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/commit.tcl b/lib/commit.tcl index e27e148..d679db4 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -263,7 +263,9 @@ proc commit_commitmsg {curHEAD msg_p} { global is_detached repo_config global pch_error - if {$is_detached && [is_config_true gui.warndetachedcommit]} { + if {$is_detached + && ![file exists [gitdir [file join rebase-merge head-name]]] + && [is_config_true gui.warndetachedcommit]} { set msg [mc "You are about to commit on a detached head.\ This is a potentially dangerous thing to do because if you switch\ to another branch you will loose your changes and it can be difficult\ -- 1.7.7.908.g383b5