| commit | e9fe413fc29efac6d223cf1bd0cad10231e37df3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Aug 2021 21:06:42 +0000 (2 14:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Aug 2021 21:06:42 +0000 (2 14:06 -0700) | ||
| tree | c49068a8158edbbd95e494393086437c2ec753b1 | treesnapshot (tar.gz zip) |
| parent | 107687b5af43ef2c8ef2051b895feae0951fe6cc | commitdiff |
| parent | d3236bececc24d4b8ddc736d278ce0d3d5ff12d6 | commitdiff |
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
Documentation fix for "git pull --rebase=no".
* fc/pull-no-rebase-merges-theirs-into-ours:
doc: pull: fix rebase=false documentation