delta/git.git, branch th/mergetools-tool-help

difftool: print list of valid tools with '--tool-help'

2012-03-15T22:52:54+00:00

Since bc7a96a (mergetool--lib: Refactor tools into separate files,
2011-08-18), it is possible to add a new diff tool by creating a simple
script in the '$(git --exec-path)/mergetools' directory.  Updating the
difftool help text is still a manual process, and the documentation can
easily go out of sync.

Teach the command to read the list of valid tools from the 'mergetools'
directory and print them for the user when the '--tool-help' option is
given.

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

mergetool--lib: Refactor tools into separate files

2011-08-19T07:09:19+00:00

Individual merge tools are now defined in a mergetools/$tool
file which is sourced at runtime.

The individual files are installed into $(git --exec-path)/mergetools/.
New tools can be added by creating a new file instead of editing the
git-mergetool--lib.sh scriptlet.

http://thread.gmane.org/gmane.comp.version-control.git/134906/focus=135006

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool--lib: Make style consistent with git

2011-08-19T07:09:17+00:00

Use the predominant conditional style where "then" appears
alone on the line after the test expression.
Remove spaces after ">" output redirections.
Remove unnecessary parentheses around the kdiff3 commands.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

difftool--helper: Make style consistent with git

2011-08-19T07:09:17+00:00

Use the predominant conditional style where "then" appears
alone on the line after the test expression.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.7

2011-08-19T05:10:23+00:00

Signed-off-by: Junio C Hamano

Merge branch 'db/am-skip-blank-at-the-beginning'

2011-08-19T05:07:57+00:00

* db/am-skip-blank-at-the-beginning:
  am: ignore leading whitespace before patch

Merge branch 'ma/am-exclude'

2011-08-19T05:07:54+00:00

* ma/am-exclude:
  am: Document new --exclude= option
  am: pass exclude down to apply

Merge branch 'maint'

2011-08-19T05:06:03+00:00

* maint:
  fetch-pack: check for valid commit from server

fetch-pack: check for valid commit from server

2011-08-18T19:25:54+00:00

A malicious server can return ACK with non-existent SHA-1 or not a
commit. lookup_commit() in this case may return NULL. Do not let
fetch-pack crash by accessing NULL address in this case.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.7

2011-08-18T00:48:36+00:00

Signed-off-by: Junio C Hamano