Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

trivial bug fix in git-ff

  • Loading branch information...
commit 7ce5cfbe851aae353135867a06500d43334e0957 1 parent 12baa46
Mark Jason Dominus (陶敏修) authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  git-ff
2  git-ff
@@ -50,7 +50,7 @@ sub ff_ref {
50 50 }
51 51 return if system("git", "get", "is-same-object", $ref, $target) == 0;
52 52 if ($is_head) {
53   - system("git", "merge", "--ff-only", $ref, $target) == 0;
  53 + system("git", "merge", "--ff-only", $target) == 0;
54 54 return;
55 55 }
56 56 chomp($ref = qx{git rev-parse --symbolic-full-name '$ref'});

0 comments on commit 7ce5cfb

Please sign in to comment.
Something went wrong with that request. Please try again.