From eca56c3347364f2dbf754f4ffa871069a9f26c7d Mon Sep 17 00:00:00 2001
From: Don <don@ohspite.net>
Date: Mon, 21 Sep 2015 17:49:26 -0400
Subject: [PATCH] vcsh: Always fast forward initial merge
Ignore `merge.ff = no` if set in .gitconfig.
---
vcsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcsh b/vcsh
index 8bfafab..4ea3125 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
--
GitLab