kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Meta/Reintegrate: make sure a merge stays a merge

todo
Junio C Hamano 2017-10-16 15:52:44 +09:00
parent 46d2baa7dc
commit 54c4940400
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Reintegrate
View File

@ -170,7 +170,7 @@ no)

rebuild=$(git config "branch.$branch.rebuild" || :)

GIT_EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
GIT_EDITOR=: git merge --no-ff $rebuild $accept_rerere --edit "$branch" ||
accept_rerere ||
exit