diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-07-26 16:19:06 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-07-26 16:19:06 +0200 |
| commit | b0f131a48cd4e72d641fcfb3c73fd6eeddafb931 (patch) | |
| tree | a9ebfdfb6b8316773145c7727af3a92a9847d72d /COMPATIBILITY.md | |
| parent | e19163e22eb19b352dd022f6edc9d81e1cd7a7ed (diff) | |
| download | go-git-b0f131a48cd4e72d641fcfb3c73fd6eeddafb931.tar.gz | |
remote: pull refactor to match default behaviour
Diffstat (limited to 'COMPATIBILITY.md')
| -rw-r--r-- | COMPATIBILITY.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index 948eb14..fa998bf 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -10,7 +10,7 @@ is supported by go-git. | config | ✔ | Reading and modifying per-repository configuration (`.git/config`) is supported. Global configuration (`$HOME/.gitconfig`) is not. | | **getting and creating repositories** | | init | ✔ | Plain init and `--bare` are supported. Flags `--template`, `--separate-git-dir` and `--shared` are not. | -| clone | ✔ | Plain clone and equivalents to `--progress`, `--single-branch`, `--depth`, `--origin`, `--recurse-submodules` are supported. Others are not. | +| clone | ✔ | Plain clone and equivalents to `--progress`, `--single-branch`, `--depth`, `--origin`, `--recurse-submodules` are supported. Others are not. | | **basic snapshotting** | | add | ✔ | Plain add is supported. Any other flag aren't supported | | status | ✔ | @@ -27,7 +27,7 @@ is supported by go-git. | tag | ✔ | | **sharing and updating projects** | | fetch | ✔ | -| pull | ✔ | +| pull | ✔ | Only supports merges where the merge can be resolved as a fast-forward. | | push | ✔ | | remote | ✔ | | submodule | ✔ | @@ -108,4 +108,4 @@ is supported by go-git. | gitattributes | ✖ | | index version | | | packfile version | | -| push-certs | ✖ |
\ No newline at end of file +| push-certs | ✖ | |