global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-14 04:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reintegrate: make merge-fix-up more noticeable

Browse Source
This commit is contained in:
Junio C Hamano
2011-02-22 14:54:41 -08:00
parent 103d04dc8b
commit cc5f90c07c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Reintegrate
View File

@@ -53,6 +53,7 @@ no)
:
elif git show-ref -q --verify "refs/merge-fix/$branch"
then
echo >&2 "Fixing up the merge"
git cherry-pick --no-commit "refs/merge-fix/$branch" &&
EDITOR=: git commit --amend -a || exit
fi