Skip to content
Permalink
Browse files
git-fork: use --fast-forward instead of --pull when syncing
Reviewed-by: rwestberg
  • Loading branch information
edvbld committed Feb 27, 2020
1 parent 710d505 commit 6b7e78753d0a81114817666bc867c7e5f97ba99f
Showing with 1 addition and 1 deletion.
  1. +1 −1 cli/src/main/java/org/openjdk/skara/cli/GitFork.java
@@ -372,7 +372,7 @@ public static void main(String[] args) throws IOException, InterruptedException
System.out.println("done");

if (shouldSync) {
GitSync.sync(repo, new String[]{"--from", "upstream", "--to", "origin", "--pull"});
GitSync.sync(repo, new String[]{"--from", "upstream", "--to", "origin", "--fast-forward"});
}

var setupPrePushHooksOption = getOption("setup-pre-push-hooks", subsection, arguments);

0 comments on commit 6b7e787

Please sign in to comment.