dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-09 09:34:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta/Reintegrate: use merge --no-edit

Browse Source
This commit is contained in:
Junio C Hamano
2012-02-09 16:03:10 -08:00
parent 5c8e8d619d
commit 5280cd6e97
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Reintegrate
View File

@@ -45,7 +45,7 @@ no)
save=$(git rev-parse --verify HEAD)
echo >&2 "* $branch"
git merge "$branch" || accept_rerere || exit
git merge --no-edit "$branch" || accept_rerere || exit
this=$(git rev-parse --verify HEAD)
if test "$this" = "$save"