diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-04-30 02:15:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-30 02:15:27 +0300 |
commit | bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7 (patch) | |
tree | 41c8af11bdbfb05d0c13db0e66c3bbddb6702e93 /Documentation/git-pull.txt | |
parent | 86ab15cb154862b6fa5cc646dac27532f881e1fb (diff) | |
parent | d9f15d37f1a545305988f6b2bb40de1fbf0049cf (diff) |
Merge branch 'dl/merge-autostash'
"git merge" learns the "--autostash" option.
* dl/merge-autostash: (22 commits)
pull: pass --autostash to merge
t5520: make test_pull_autostash() accept expect_parent_num
merge: teach --autostash option
sequencer: implement apply_autostash_oid()
sequencer: implement save_autostash()
sequencer: unlink autostash in apply_autostash()
sequencer: extract perform_autostash() from rebase
rebase: generify create_autostash()
rebase: extract create_autostash()
reset: extract reset_head() from rebase
rebase: generify reset_head()
rebase: use apply_autostash() from sequencer.c
sequencer: rename stash_sha1 to stash_oid
sequencer: make apply_autostash() accept a path
rebase: use read_oneliner()
sequencer: make read_oneliner() extern
sequencer: configurably warn on non-existent files
sequencer: make read_oneliner() accept flags
sequencer: make file exists check more efficient
sequencer: stop leaking buf
...
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 9c7ab2d48f..5c3fb67c01 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -134,15 +134,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ |