summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-14 12:33:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-14 12:33:57 -0800
commit1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc (patch)
tree66a79a2fb73906937a9534fe8efea6b29f070114
parentMerge branch 'aw/doc-smtp-ssl-cert-path' (diff)
parentgit-completion: add --autostash for 'git rebase' (diff)
downloadtgif-1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc.tar.xz
Merge branch 'mm/complete-rebase-autostash'
* mm/complete-rebase-autostash: git-completion: add --autostash for 'git rebase'
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index cd765795ae..8cfee95f88 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1693,6 +1693,7 @@ _git_rebase ()
--committer-date-is-author-date --ignore-date
--ignore-whitespace --whitespace=
--autosquash --fork-point --no-fork-point
+ --autostash
"
return