diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-13 15:01:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 15:01:41 -0700 |
| commit | 5996b6708bc4458944b9a352131bf882bedd1535 (patch) | |
| tree | edd298d85f738b1ebc56585b3503bc72b4a4754e /git-pull.txt | |
| parent | 84ea1e42221ac3bab88dda1a6ee25a11802cfef9 (diff) | |
| download | git-htmldocs-5996b6708bc4458944b9a352131bf882bedd1535.tar.gz | |
Autogenerated HTML docs for v2.8.1-185-gdc0db
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-pull.txt b/git-pull.txt index a62a2a615..d033b258e 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -128,6 +128,15 @@ 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 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ |