projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0eea345) | patch
Add -y/--no-prompt option to mergetool
authorCharles Bailey <charles@hashpling.org>
Thu, 13 Nov 2008 12:41:14 +0000 (12:41 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Nov 2008 05:30:55 +0000 (21:30 -0800)
commit682b451f84c046aa5b082e89e3db62950cb6261a
treefd7864b1814217518df587acfcdbc3c92d4f9d67tree | snapshot
parent0eea345111a9b9fea4dd2841b80bc7d62964e812commit | diff
Add -y/--no-prompt option to mergetool

This option lets git mergetool invoke the conflict resolution program
without waiting for a user prompt each time.

Also added a mergetool.prompt (default true) configuration variable
controlling the same behaviour

Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt diff | blob | history
Documentation/git-mergetool.txt diff | blob | history
git-mergetool.sh diff | blob | history
Git—the stupid content tracker