delta/git.git, branch db/show-ref-head

show-ref: make --head always show the HEAD ref

2013-07-18T00:52:28+00:00

The docs seem to say that doing

	git show-ref --head --tags

would show both the HEAD ref and all the tag refs. However, doing
both --head and either of --tags or --heads would filter out the HEAD
ref.

Also update the documentation to describe the new behavior and add
tests for the show-ref command.

[jc: Doug did proofread the tests, but it was done by me and bugs in
it are mine].

Signed-off-by: Doug Bell 
Signed-off-by: Junio C Hamano

Git 1.8.2

2013-03-13T18:28:08+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2013-03-11T20:00:16+00:00

* maint:
  git.c: make usage match manual page

git.c: make usage match manual page

2013-03-11T19:59:57+00:00

Reorder option list in command-line usage to match the manual page.
Also make it less than 80-characters wide.

Signed-off-by: Kevin Bracey 
Signed-off-by: Junio C Hamano

Merge branch 'mp/complete-paths'

2013-03-11T17:32:16+00:00

* mp/complete-paths:
  git-completion.bash: zsh does not implement function redirection correctly

Merge branch 'mm/add-u-A-finishing-touches'

2013-03-11T17:32:03+00:00

* mm/add-u-A-finishing-touches:
  add: update pathless 'add [-u|-A]' warning to reflect change of plan

git-completion.bash: zsh does not implement function redirection correctly

2013-03-11T17:22:56+00:00

A recent change added functions whose entire standard error stream
is redirected to /dev/null using a construct that is valid POSIX.1
but is not widely used:

	funcname () {
		cd "$1" && run some command "$2"
	} 2>/dev/null

Even though this file is "git-completion.bash", zsh completion
support dot-sources it (instead of asking bash to grok it like tcsh
completion does), and zsh does not implement this redirection
correctly.

With zsh, trying to complete an inexistant directory gave this:

  git add no-such-dir/__git_ls_files_helper:cd:2: no such file or directory: no-such-dir/

Also these functions use "cd" to first go somewhere else before
running a command, but the location the caller wants them to go that
is given as an argument to them should not be affected by CDPATH
variable the users may have set for their interactive session.

To fix both of these, wrap the body of the function in a subshell,
unset CDPATH at the beginning of the subshell, and redirect the
standard error stream of the subshell to /dev/null.

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

Merge branch 'gp/add-u-A-documentation'

2013-03-11T15:11:38+00:00

* gp/add-u-A-documentation:
  add: Clarify documentation of -A and -u

add: update pathless 'add [-u|-A]' warning to reflect change of plan

2013-03-11T14:57:35+00:00

We originally thought the transition would need a period where "git add
[-u|-A]" without pathspec would be forbidden, but the warning is big
enough to scare people and teach them not to use it (or, if so, to
understand the consequences).

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2013-03-11T05:29:29+00:00

* maint:
  Translate git_more_info_string consistently