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
@@ -100,7 +100,7 @@ no)
100
mb=$(git merge-base "$tip" "$save")
101
test "$mb" = "$tip" && continue
102
103
- git merge $accept_rerere --no-edit "$branch" ||
103
+ EDITOR=: git merge $accept_rerere "$branch" ||
104
accept_rerere ||
105
exit
106