fortressforever/git-svn-sync
0
0
Fork 0
mirror of https://github.com/fortressforever/git-svn-sync.git synced 2024-11-24 13:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove --allow-empty option from cherry-pick

Browse source
This commit is contained in:
squeek 2014-11-12 14:58:28 -08:00
parent 5462597156
commit 3e85f68c5d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-mirror-to-svn.sh
View file

@ -45,6 +45,6 @@ if [ -n "$(git status --porcelain)" ] ; then
fi
git fetch origin
git cherry-pick -Xtheirs --allow-empty ${commits_to_pick} || { report "Could not cherry pick from git repository" ; exit 1; }
git cherry-pick -Xtheirs ${commits_to_pick} || { report "Could not cherry pick from git repository" ; exit 1; }
git svn dcommit || { report "Could not send changes to svn repository" ; exit 1; }