From: Richard Hartmann <RichiH@users.noreply.github.com>
Date: Sun, 29 Nov 2015 19:14:48 +0000 (+0100)
Subject: Merge pull request #183 from ohspite/ff-initial-merge
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/cf9bd27d5bcbecf461b55acd76dbf57679e4a6b3?hp=9d67671f8cdb7786fe833c665e016d02dbe3ce31

Merge pull request #183 from ohspite/ff-initial-merge

vcsh: Always fast forward initial merge
---

diff --git a/vcsh b/vcsh
index 9a5d5e0..c30b12d 100755
--- a/vcsh
+++ b/vcsh
@@ -169,7 +169,7 @@ clone() {
 	[ x"$VCSH_CONFLICT" = x'1' ]) &&
 		fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
-	git merge origin/"$VCSH_BRANCH"
+	git -c merge.ff=true merge origin/"$VCSH_BRANCH"
 	hook post-merge
 	hook post-clone
 	retire