diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:48:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:48:56 -0700 |
| commit | 011710a315a5e4157e882880fe77798f8d4adde0 (patch) | |
| tree | 6ca7d13272c52cc839472d3d5f92abf04ab759cd /contrib | |
| parent | Merge branch 'jk/git-path' (diff) | |
| parent | completion: offer '--edit-todo' during interactive rebase (diff) | |
| download | tgif-011710a315a5e4157e882880fe77798f8d4adde0.tar.xz | |
Merge branch 'tb/complete-rebase-i-edit-todo'
The command-line completion script (in contrib/) has been updated.
* tb/complete-rebase-i-edit-todo:
completion: offer '--edit-todo' during interactive rebase
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c97c648d7e..087771bb89 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1667,7 +1667,10 @@ _git_push () _git_rebase () { local dir="$(__gitdir)" - if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then + if [ -f "$dir"/rebase-merge/interactive ]; then + __gitcomp "--continue --skip --abort --edit-todo" + return + elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then __gitcomp "--continue --skip --abort" return fi |