diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-04-07 16:28:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-10 18:28:02 +0200 |
| commit | d9f15d37f1a545305988f6b2bb40de1fbf0049cf (patch) | |
| tree | 9ba6f8add9d176addd453d87276c37dba0025f6f /Documentation/git-pull.txt | |
| parent | t5520: make test_pull_autostash() accept expect_parent_num (diff) | |
| download | git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.tar.xz git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.zip | |
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/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index dfb901f8b8..ba3772de9f 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -133,15 +133,6 @@ unless you have read linkgit:git-rebase[1] carefully. --no-rebase:: Override earlier --rebase. ---autostash:: ---no-autostash:: - Before starting rebase, stash local modifications away (see - linkgit:git-stash[1]) if needed, and apply the stash entry when - done. `--no-autostash` is useful to override the `rebase.autoStash` - configuration variable (see linkgit:git-config[1]). -+ -This option is only valid when "--rebase" is used. - Options related to fetching ~~~~~~~~~~~~~~~~~~~~~~~~~~~ |