Tim Henigan <tim.henigan@xxxxxxxxx> writes: > When difftool was changed to use Getopt::Long, it changed the way that > the '--prompt' and '--no-prompt' options are handled. Prior to the change, > if both options were given, then the last option was used. After the > change, if both were given, then '--prompt' was always used. > > This commit teaches difftool to exit with an error if both options are > given at the command line. t7800 was updated to match. Hrm, people with "[alias] mdt = difftool --prompt" have every right to expect their $ git mdt --no-prompt to keep working, no? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html