diff options
| author | John Cai <jcai@gitlab.com> | 2022-01-05 16:28:46 -0500 |
|---|---|---|
| committer | Paulo Gomes <paulo.gomes@suse.com> | 2024-03-09 08:57:47 +0000 |
| commit | 4bed23037f0e374d85bce1506e9df98ce0cfcd32 (patch) | |
| tree | 71bab2968373e3d3586a08dff4bab623bccfdd10 /plumbing/format/pktline/scanner.go | |
| parent | d9497bae668afcc540fa6f2177575777b3ff91de (diff) | |
| download | go-git-4bed23037f0e374d85bce1506e9df98ce0cfcd32.tar.gz | |
git: Add Merge with ff-only
Add a Merge function that behaves like git merge. This is a first
iteration that only supports --ff-only, which is the simplest type of
merge.
Diffstat (limited to 'plumbing/format/pktline/scanner.go')
0 files changed, 0 insertions, 0 deletions