summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-14 20:33:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-14 20:33:57 (GMT)
commit1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc (patch)
tree66a79a2fb73906937a9534fe8efea6b29f070114 /contrib
parent8128835f91f67741c931858d5523f1ee57ef0fce (diff)
parentd89ad9c1b8878c54dd46725bd3c01e53b46f748a (diff)
downloadgit-1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc.zip
git-1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc.tar.gz
git-1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc.tar.bz2
Merge branch 'mm/complete-rebase-autostash'
* mm/complete-rebase-autostash: git-completion: add --autostash for 'git rebase'
Diffstat (limited to 'contrib')
-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 cd76579..8cfee95 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