global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-15 13:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Abort if --rejoin fails.

Browse Source 
Thanks to Eduardo Kienetz for noticing this.
This commit is contained in:
Avery Pennarun
2009-04-30 21:57:32 -04:00
parent 942dce5578
commit ea28d67442
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-subtree.sh
View File

@@ -406,7 +406,7 @@ cmd_split()
debug "Merging split branch into HEAD..."
latest_old=$(cache_get latest_old)
git merge -s ours \
-m "$(merge_msg $dir $latest_old $latest_new)" \
-m "$(merge_msg $dir $latest_old $latest_new)" \
$latest_new >&2 || exit $?
fi
echo $latest_new