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
This commit is contained in:
commit
011710a315
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user