diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-02 14:06:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-02 14:06:42 -0700 |
| commit | e9fe413fc29efac6d223cf1bd0cad10231e37df3 (patch) | |
| tree | c49068a8158edbbd95e494393086437c2ec753b1 /git-merge-octopus.sh | |
| parent | Merge branch 'ab/bundle-tests' (diff) | |
| parent | doc: pull: fix rebase=false documentation (diff) | |
| download | tgif-e9fe413fc29efac6d223cf1bd0cad10231e37df3.tar.xz | |
Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'
Documentation fix for "git pull --rebase=no".
* fc/pull-no-rebase-merges-theirs-into-ours:
doc: pull: fix rebase=false documentation
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions