From a5873c4d69f93d852c3ecca0d40f74035620a3c7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Jun 2012 21:15:36 -0700 Subject: [PATCH] Meta/Reintegrate: work around minor --no-edit breakage For --no-edit to be true replacement of one-shot export of EDITOR=:, it should trigger stripspace() to remove comments, but currently it doesn't. Avoid using it for now. --- Reintegrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reintegrate b/Reintegrate index 98fb07dde8..419e9127d9 100755 --- a/Reintegrate +++ b/Reintegrate @@ -100,7 +100,7 @@ no) mb=$(git merge-base "$tip" "$save") test "$mb" = "$tip" && continue - git merge $accept_rerere --no-edit "$branch" || + EDITOR=: git merge $accept_rerere "$branch" || accept_rerere || exit -- 2.47.3