diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-04-07 14:28:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-10 16:28:02 (GMT) |
| commit | d9f15d37f1a545305988f6b2bb40de1fbf0049cf (patch) | |
| tree | 9ba6f8add9d176addd453d87276c37dba0025f6f /Documentation/merge-options.txt | |
| parent | f8a178580719a93040a49cf25624f1d56d0147f1 (diff) | |
| download | git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.zip git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.tar.gz git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.tar.bz2 | |
pull: pass --autostash to merge
Before, `--autostash` only worked with `git pull --rebase`. However, in
the last patch, merge learned `--autostash` as well so there's no reason
why we should have this restriction anymore. Teach pull to pass
`--autostash` to merge, just like it did for rebase.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 3985e6d..48bfcda 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -155,6 +155,8 @@ ifndef::git-pull[] Note that not all merge strategies may support progress reporting. +endif::git-pull[] + --autostash:: --no-autostash:: Automatically create a temporary stash entry before the operation @@ -163,8 +165,6 @@ ifndef::git-pull[] with care: the final stash application after a successful merge might result in non-trivial conflicts. -endif::git-pull[] - --allow-unrelated-histories:: By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be |