| commit | 682b451f84c046aa5b082e89e3db62950cb6261a | |
| author | Charles Bailey <charles@hashpling.org> | |
| Thu, 13 Nov 2008 12:41:14 +0000 (13 12:41 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 15 Nov 2008 05:30:55 +0000 (14 21:30 -0800) | ||
| tree | fd7864b1814217518df587acfcdbc3c92d4f9d67 | treesnapshot (tar.gz zip) |
| parent | 0eea345111a9b9fea4dd2841b80bc7d62964e812 | commitdiff |
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>
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 | diffblobblamehistory | |
| Documentation/git-mergetool.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |