aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCornelius Weig <cornelius.weig@tngtech.com>2017-02-03 12:01:54 +0100
committerJunio C Hamano <gitster@pobox.com>2017-02-03 22:25:46 -0800
commite24a256b5946f933d19d68ec071d80990bffcebd (patch)
tree070480b124447b44ed802b71153aee22e841550f
parent65d5a1e0a5af4b4bb0878d1e35c0e8dd50d8a0f5 (diff)
downloadgit-e24a256b5946f933d19d68ec071d80990bffcebd.tar.gz
git-e24a256b5946f933d19d68ec071d80990bffcebd.tar.xz
completion: add subcommand completion for rerere
Managing recorded resolutions requires command-line usage of git-rerere. Added subcommand completion for rerere and path completion for its subcommand forget. Signed-off-by: Cornelius Weig <cornelius.weig@tngtech.com> Reviewed-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/completion/git-completion.bash11
1 files changed, 11 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d4343bead..d1a43f938 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2401,6 +2401,17 @@ _git_replace ()
__gitcomp_nl "$(__git_refs)"
}
+_git_rerere ()
+{
+ local subcommands="clear forget diff remaining status gc"
+ local subcommand="$(__git_find_on_cmdline "$subcommands")"
+ if test -z "$subcommand"
+ then
+ __gitcomp "$subcommands"
+ return
+ fi
+}
+
_git_reset ()
{
__git_has_doubledash && return