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.
Junio C Hamano committed
Jun 27, 2012 at 21:15 UTC
a5873c4d69f93d852c3ecca0d40f74035620a3c7
1 file changed
+1
-1
Reintegrate
+1
-1
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