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: allow refs/merge-fix/* to supply evil-merge-fixups

Browse Source
This commit is contained in:
Junio C Hamano
2009-11-14 15:59:49 -08:00
parent 547cfe39a6
commit bcab27041c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Reintegrate
View File

@@ -38,7 +38,13 @@ do
case "$eh" in
"")
echo >&2 "* $branch"
git merge "$branch" || accept_rerere || exit ;;
git merge "$branch" || accept_rerere || exit
if git show-ref -q --verify "refs/merge-fix/$branch"
then
git cherry-pick --no-commit "refs/merge-fix/$branch" &&
EDITOR=: git commit --amend -a
fi
;;
pick" "*)
echo >&2 "* $eh"
git cherry-pick "$branch" || exit ;;