diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-21 02:53:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-21 02:53:31 +0400 |
| commit | f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4 (patch) | |
| tree | 1c680a7b5dffe18723b5a4a84d6475e14445b031 /contrib | |
| parent | f2fef7b55aea64104a6aee662817e1e6f0b22f71 (diff) | |
| parent | e17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (diff) | |
Merge branch 'nd/maint-remote-remove' into maint
* nd/maint-remote-remove:
remote: prefer subcommand name 'remove' to 'rm'
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 5a5b5a0b3c..3b98290349 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2040,7 +2040,7 @@ _git_config () _git_remote () { - local subcommands="add rename rm set-head set-branches set-url show prune update" + local subcommands="add rename remove set-head set-branches set-url show prune update" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then __gitcomp "$subcommands" @@ -2048,7 +2048,7 @@ _git_remote () fi case "$subcommand" in - rename|rm|set-url|show|prune) + rename|remove|set-url|show|prune) __gitcomp_nl "$(__git_remotes)" ;; set-head|set-branches) |