diff options
author | Paulo Gomes <pjbgf@linux.com> | 2024-03-12 07:46:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-12 07:46:57 +0000 |
commit | e6c3e58198d176c497bb2dba1a2adb9302597676 (patch) | |
tree | ce3f6ddf6f98715bf84c883482783ef4fc974add /remote.go | |
parent | f4f1a876e622c45ed51d05df1298d421a6868fcc (diff) | |
parent | 3ee5bc9dd308a5503d60cc26d17d7f10df28c37a (diff) | |
download | go-git-e6c3e58198d176c497bb2dba1a2adb9302597676.tar.gz |
Merge pull request #1044 from pjbgf/ff-merge
git: Implement Merge function with initial `FastForwardMerge` support
Diffstat (limited to 'remote.go')
-rw-r--r-- | remote.go | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1128,7 +1128,7 @@ func isFastForward(s storer.EncodedObjectStorer, old, new plumbing.Hash, earlies } found := false - // stop iterating at the earlist shallow commit, ignoring its parents + // stop iterating at the earliest shallow commit, ignoring its parents // note: when pull depth is smaller than the number of new changes on the remote, this fails due to missing parents. // as far as i can tell, without the commits in-between the shallow pull and the earliest shallow, there's no // real way of telling whether it will be a fast-forward merge. |