diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 20:23:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 20:23:37 +0300 |
| commit | 00bcc35081f6fd247fa4024bd256c1ab4082f9bf (patch) | |
| tree | f852b0b59b6ab0f4877f2e5faf83a15d08858a6a /contrib | |
| parent | 6cddb7362ca3c7312b57a4f172bca5c953a45b6c (diff) | |
| parent | 541c2a3a3db92a4348f3d9c6b234cedef2853c0b (diff) | |
Merge branch 'ac/complete-pull-autostash'
The shell completion (in contrib/) learned that "git pull" can take
the "--autostash" option.
* ac/complete-pull-autostash:
completion: add --autostash and --no-autostash to pull
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 35df6ce9ea..3683c772c5 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1922,6 +1922,7 @@ _git_pull () --*) __gitcomp " --rebase --no-rebase + --autostash --no-autostash $__git_merge_options $__git_fetch_options " |