git/contrib/completion/git-completion.bash, branch v2.1.2

Merge branch 'jk/more-push-completion'

2014-07-30T21:21:14Z

* jk/more-push-completion: completion: complete `git push --force-with-lease=` completion: add some missing options to `git push` completion: complete "unstuck" `git push --recurse-submodules`

completion: complete `git push --force-with-lease=`

2014-07-22T20:30:30Z

Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: add some missing options to `git push`

2014-07-22T20:23:39Z

Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: complete "unstuck" `git push --recurse-submodules`

2014-07-22T20:21:07Z

Since the argument to `--recurse-submodules` is mandatory, it does not need to be stuck to the option with `=`. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'sp/complete-ext-alias'

2014-06-25T19:23:27Z

* sp/complete-ext-alias: completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

2014-06-13T20:37:43Z

'!f() { ... }; f' and "!sh -c '....' -" are recommended patterns for declaring more complex aliases (see git wiki [1]). This commit teaches the completion to handle them. When determining which completion to use for an alias, an opening brace or single quote is now skipped, and the search for a git command is continued. For example, the aliases '!f() { git commit ... }' or "!sh -c 'git commit ...'" now trigger commit completion. Previously, the search stopped on the opening brace or quote, and the completion tried it to determine how to complete, which obviously was useless. The null command ':' is now skipped, so that it can be used as a workaround to declare the desired completion style. For example, the aliases !f() { : git commit ; if ... } f !sh -c ': git commit; if ...' - now trigger commit completion. Shell function declarations now work with or without space before the parens, i.e. '!f() ...' and '!f () ...' both work. [1] https://git.wiki.kernel.org/index.php/Aliases Signed-off-by: Steffen Prohaska Signed-off-by: Junio C Hamano

completion: add missing options for git-merge

2014-05-27T19:27:50Z

The options added to __git_merge_options are those that git-pull passes to git-merge, since that variable is used by both commands. Those added directly in _git_merge() are specific to git-merge and are not passed thru from git-pull. Reported-by: Haralan Dobrev Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: add a note that merge options are shared

2014-05-27T19:27:36Z

This should avoid future confusion after a subsequent patch has added some options to __git_merge_options and some directly in _git_merge(). Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: fix completing args of aliased "push", "fetch", etc.

2014-04-09T21:22:18Z

Some commands need the first word to determine the actual action that is being executed, however, the command is wrong when we use an alias, for example 'alias.p=push', if we try to complete 'git p origin ', the result would be wrong because __git_complete_remote_or_refspec() doesn't know where it came from. So let's override words[1], so the alias 'p' is override by the actual command, 'push'. Reported-by: Aymeric Beaumet Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Merge branch 'ss/completion-rec-sub-fetch-push'

2014-03-14T21:24:15Z

* ss/completion-rec-sub-fetch-push: completion: teach --recurse-submodules to fetch, pull and push