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 /COMPATIBILITY.md | |
| 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 'COMPATIBILITY.md')
| -rw-r--r-- | COMPATIBILITY.md | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index c1f280d..ff0c22c 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -27,14 +27,14 @@ compatibility status with go-git. ## Branching and merging -| Feature | Sub-feature | Status | Notes | Examples | -| ----------- | ----------- | ------ | --------------------------------------- | ----------------------------------------------------------------------------------------------- | -| `branch` | | ✅ | | - [branch](_examples/branch/main.go) | -| `checkout` | | ✅ | Basic usages of checkout are supported. | - [checkout](_examples/checkout/main.go) | -| `merge` | | ❌ | | | -| `mergetool` | | ❌ | | | -| `stash` | | ❌ | | | -| `tag` | | ✅ | | - [tag](_examples/tag/main.go) <br/> - [tag create and push](_examples/tag-create-push/main.go) | +| Feature | Sub-feature | Status | Notes | Examples | +| ----------- | ----------- | ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------- | +| `branch` | | ✅ | | - [branch](_examples/branch/main.go) | +| `checkout` | | ✅ | Basic usages of checkout are supported. | - [checkout](_examples/checkout/main.go) | +| `merge` | | ⚠️ (partial) | Fast-forward only | | +| `mergetool` | | ❌ | | | +| `stash` | | ❌ | | | +| `tag` | | ✅ | | - [tag](_examples/tag/main.go) <br/> - [tag create and push](_examples/tag-create-push/main.go) | ## Sharing and updating projects |