Permalink
Browse files

Fix "Use merge not pull to fast-forward"

I have no idea how this slipped though. Sorry for any inconvienience
this may have caused.

Signed-off-by: Simon Thum <simon.thum@gmx.de>

Conflicts:

	git-sync
  • Loading branch information...
1 parent 1bdf6b2 commit 2ef5dc457459866c21a70c94b7a32fc430d7edac @simonthum committed Aug 9, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 git-sync
View
@@ -304,7 +304,7 @@ case "$(sync_state)" in
;;
"behind")
echo "git-sync: We are behind, fast-forwarding..."
- git merge --ff --ff-only
+ git merge --ff --ff-only $remote_name/$branch_name
if [ $? == 0 ]; then
exit_assuming_sync
else

0 comments on commit 2ef5dc4

Please sign in to comment.