projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e449f10) | patch
Remove the use of '--' in merge program invocation
authorPatrick Higgins <patrick.higgins@cexp.com>
Mon, 16 Jun 2008 23:33:41 +0000 (17:33 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Jun 2008 21:13:55 +0000 (14:13 -0700)
commit641dba49bf819dc5f4874a75b206bc7f51dc14e6
tree798b8d6fc0aac56346d545f006d90bb63613287atree | snapshot
parente449f105805ffa49ccf7cf080db897ecf65a1a0fcommit | diff
Remove the use of '--' in merge program invocation

Put a "./" at the beginning of all paths given to the merge program so
that filenames beginning with a '-' character don't get interpreted as
options.

This deals with a problem where kdiff3 can be compiled with or without
support for the '--' separator between options and filenames.

Signed-off-by: Patrick Higgins <patrick.higgins@cexp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh diff | blob | history
Git—the stupid content tracker