git/contrib/completion/git-completion.bash, branch v2.0.2Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v2.0.22014-05-27T19:27:50Zcompletion: add missing options for git-merge2014-05-27T19:27:50ZJohn Keepingjohn@keeping.me.uk2014-05-22T13:58:38Zurn:sha1:8fee8726470bd63db6c396ea6208ea487eaa8fab
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 <hkdobrev@gmail.com>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: add a note that merge options are shared2014-05-27T19:27:36ZJohn Keepingjohn@keeping.me.uk2014-05-22T13:58:37Zurn:sha1:6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f
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 <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: fix completing args of aliased "push", "fetch", etc.2014-04-09T21:22:18ZFelipe Contrerasfelipe.contreras@gmail.com2014-04-09T18:50:04Zurn:sha1:880111c11befaaf070e8ea1021bf11b4fb58c461
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 <aymeric.beaumet@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ss/completion-rec-sub-fetch-push'2014-03-14T21:24:15ZJunio C Hamanogitster@pobox.com2014-03-14T21:24:15Zurn:sha1:baf9e83c2105527a75c2838d63e290ec87712ca6
* ss/completion-rec-sub-fetch-push:
completion: teach --recurse-submodules to fetch, pull and push
completion: teach --recurse-submodules to fetch, pull and push2014-02-11T19:17:04ZSup Yut Sumch3cooli@gmail.com2014-02-09T14:35:31Zurn:sha1:4dd5c4709a51bb704c2c7fb59170b494b76daab9
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jk/complete-merge-base'2014-01-27T18:43:55ZJunio C Hamanogitster@pobox.com2014-01-27T18:43:55Zurn:sha1:ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60
* jk/complete-merge-base:
completion: handle --[no-]fork-point options to git-rebase
completion: complete merge-base options
completion: handle --[no-]fork-point options to git-rebase2014-01-13T22:20:31ZJohn Keepingjohn@keeping.me.uk2014-01-11T14:27:13Zurn:sha1:4310e328d416be00e58e90b69ed3b62f5845c744
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: complete merge-base options2014-01-13T22:20:25ZJohn Keepingjohn@keeping.me.uk2014-01-11T14:27:12Zurn:sha1:85453fd1e36c581c1e6b7939e46badf2581837b3
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'rr/completion-format-coverletter'2014-01-13T19:33:38ZJunio C Hamanogitster@pobox.com2014-01-13T19:33:38Zurn:sha1:ca46578a1d6ee3f6e27eafa7902fd4e62d58db7d
The bash/zsh completion code did not know about format.coverLetter
among many format.* configuration variables.
* rr/completion-format-coverletter:
completion: complete format.coverLetter
completion: complete format.coverLetter2014-01-07T17:59:25ZRamkumar Ramachandraartagnon@gmail.com2014-01-06T17:18:51Zurn:sha1:de06c13a9464440778ef060e42a0258c8c55f4ad
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>