{"thread":{"id":"52059","subject":"Set default strategy options for merge/rebase","startedAt":"2019-10-17T18:48:45Z","lastAt":"2019-10-17T18:48:45Z","messageCount":1,"participants":["Yuri D'Elia"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"384286","messageId":"87eezbi4xt.fsf@wavexx.thregr.org","threadId":"52059","inReplyTo":null,"subject":"Set default strategy options for merge/rebase","fromName":"Yuri D'Elia","fromEmail":"wavexx@thregr.org","sentAt":"2019-10-17T18:48:30Z","receivedAt":"2019-10-17T18:48:45Z","isPatch":false,"sender":{"key":"wavexx@thregr.org","avatar":null},"body":"Is it (or would it be) possible to set the default strategy and strategy\noptions as provided by merge/rebase ``-s`` and ``-X`` in gitconfig?\n\nI found myself comparing several conflicts using recursive's -Xpatience,\nand in some cases the difference is quite staggering, changing from a\njumbled mess to a compact and readable diff.\n\nI'd love to be able to set it as a default to play around more (without\naliasing, that is).\n\nIt's also unclear to me from the documentation of git merge whether\n-Xdiff-algorithm=? is an exception to the default diff algorithm\n(diff.algorithm) or if that's completely independent setting meaning\nthat merge always ignores diff.algorithm to begin with.\n\nAnd also, is -Xpatience just a shortcut to -Xdiff-algorithm=patience?\n\nThanks!\n\n"}]}