diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-13 21:12:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 21:12:36 (GMT) |
| commit | 7c137bb5316fbd82e816c2dabebc1d347261c93e (patch) | |
| tree | c2e928c5797ffcae135f2d7dca03d324f3e2fb22 /Documentation | |
| parent | 34e859d372fd26a661b080ee8ae1523201d28808 (diff) | |
| parent | 450dd1dce1fbf6a6743e74d6aef750068fc5069c (diff) | |
| download | git-7c137bb5316fbd82e816c2dabebc1d347261c93e.zip git-7c137bb5316fbd82e816c2dabebc1d347261c93e.tar.gz git-7c137bb5316fbd82e816c2dabebc1d347261c93e.tar.bz2 | |
Merge branch 'mj/pull-rebase-autostash'
"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.
* mj/pull-rebase-autostash:
t5520: test --[no-]autostash with pull.rebase=true
t5520: reduce commom lines of code
t5520: factor out common "failing autostash" code
t5520: factor out common "successful autostash" code
t5520: use better test to check stderr output
t5520: ensure consistent test conditions
t5520: use consistent capitalization in test titles
pull --rebase: add --[no-]autostash flag
git-pull.c: introduce git_pull_config()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index a62a2a6..d033b25 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ |