diff options
| author |  Albert Astals Cid <albert.astals.cid@kdab.com> | 2017-11-21 15:39:28 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-22 16:31:43 +0900 |
| commit | 541c2a3a3db92a4348f3d9c6b234cedef2853c0b (patch) | |
| tree | 5627731543af3b3dc8f40838049dcf4443adaea1 /contrib | |
| parent | Sync with maint (diff) | |
| download | tgif-541c2a3a3db92a4348f3d9c6b234cedef2853c0b.tar.xz | |
completion: add --autostash and --no-autostash to pull
Ideally we should only autocomplete if pull has --rebase since
they only work with it but could not figure out how to do that
and the error message of doing git pull --autostash points out
that you need --rebase so i guess it's good enough
Signed-off-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 f07f16b28f..be9cf0acc0 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 " |