delta/git.git/contrib/completion, branch baserock/ps/update-git github.com: git/git.git Merge branch 'jk/complete-merge-base' 2014-01-27T18:43:55+00:00 Junio C Hamano gitster@pobox.com 2014-01-27T18:43:55+00:00 ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60 * jk/complete-merge-base: completion: handle --[no-]fork-point options to git-rebase completion: complete merge-base options 
* 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-rebase 2014-01-13T22:20:31+00:00 John Keeping john@keeping.me.uk 2014-01-11T14:27:13+00:00 4310e328d416be00e58e90b69ed3b62f5845c744 Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: complete merge-base options 2014-01-13T22:20:25+00:00 John Keeping john@keeping.me.uk 2014-01-11T14:27:12+00:00 85453fd1e36c581c1e6b7939e46badf2581837b3 Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
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:38+00:00 Junio C Hamano gitster@pobox.com 2014-01-13T19:33:38+00:00 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 
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.coverLetter 2014-01-07T17:59:25+00:00 Ramkumar Ramachandra artagnon@gmail.com 2014-01-06T17:18:51+00:00 de06c13a9464440778ef060e42a0258c8c55f4ad Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: fix remote.pushdefault 2014-01-06T17:17:25+00:00 Ramkumar Ramachandra artagnon@gmail.com 2014-01-05T10:18:05+00:00 c39a2f117853d89f0aee5b616c52df46a30b108b When attempting to complete $ git config remote.push<TAB> 'pushdefault' doesn't come up. This is because "$cur" is matched with "remote.*" and a list of remotes are completed. Add 'pushdefault' as a candidate for completion too, using __gitcomp_nl_append (). Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
When attempting to complete

  $ git config remote.push<TAB>

'pushdefault' doesn't come up. This is because "$cur" is matched with
"remote.*" and a list of remotes are completed. Add 'pushdefault' as a
candidate for completion too, using __gitcomp_nl_append ().

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: fix branch.autosetup(merge|rebase) 2014-01-06T17:17:05+00:00 Ramkumar Ramachandra artagnon@gmail.com 2014-01-05T10:18:04+00:00 422553df49bee5a5ea3c9106dfb7f1e4cbb54153 When attempting to complete $ git config branch.auto<TAB> 'autosetupmerge' and 'autosetuprebase' don't come up. This is because "$cur" is matched with "branch.*" and a list of branches are completed. Add 'autosetupmerge', 'autosetuprebase' as candidates for completion too, using __gitcomp_nl_append (). Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
When attempting to complete

  $ git config branch.auto<TAB>

'autosetupmerge' and 'autosetuprebase' don't come up. This is because
"$cur" is matched with "branch.*" and a list of branches are
completed. Add 'autosetupmerge', 'autosetuprebase' as candidates for
completion too, using __gitcomp_nl_append ().

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: introduce __gitcomp_nl_append () 2014-01-06T17:14:48+00:00 Ramkumar Ramachandra artagnon@gmail.com 2014-01-05T10:18:03+00:00 f33c2c0f9e2258a80e6e406af39e9fa3fd6e430e There are situations where multiple classes of completions possible. For example branch.<TAB> should try to complete branch.master. branch.autosetupmerge branch.autosetuprebase The first candidate has the suffix ".", and the second/ third candidates have the suffix " ". To facilitate completions of this kind, create a variation of __gitcomp_nl () that appends to the existing list of completion candidates, COMPREPLY. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
There are situations where multiple classes of completions possible. For
example

  branch.<TAB>

should try to complete

  branch.master.
  branch.autosetupmerge
  branch.autosetuprebase

The first candidate has the suffix ".", and the second/ third candidates
have the suffix " ". To facilitate completions of this kind, create a
variation of __gitcomp_nl () that appends to the existing list of
completion candidates, COMPREPLY.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
zsh completion: find matching custom bash completion 2014-01-06T17:14:29+00:00 Ramkumar Ramachandra artagnon@gmail.com 2014-01-05T10:18:02+00:00 d028b8906afb5b8c24c9449f26e5f930750d8df7 If zsh completion is being read from a location that is different from system-wide default, it is likely that the user is trying to use a custom version, perhaps closer to the bleeding edge, installed in her own directory. We will more likely to find the matching bash completion script in the same directory than in those system default places. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
If zsh completion is being read from a location that is different from
system-wide default, it is likely that the user is trying to use a
custom version, perhaps closer to the bleeding edge, installed in her
own directory. We will more likely to find the matching bash completion
script in the same directory than in those system default places.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jn/scripts-updates' 2013-12-12T22:22:59+00:00 Junio C Hamano gitster@pobox.com 2013-12-12T22:22:59+00:00 694a88a309c74ffeefa9a0db0396ee4c168a521c * jn/scripts-updates: remove #!interpreter line from shell libraries test: replace shebangs with descriptions in shell libraries test: make FILEMODE a lazy prereq contrib: remove git-p4import mark contributed hooks executable mark perl test scripts executable mark Windows build scripts executable 
* jn/scripts-updates:
  remove #!interpreter line from shell libraries
  test: replace shebangs with descriptions in shell libraries
  test: make FILEMODE a lazy prereq
  contrib: remove git-p4import
  mark contributed hooks executable
  mark perl test scripts executable
  mark Windows build scripts executable