On Thu, Jun 18, 2015 at 4:43 AM David Aguilar wrote:
>
> On Wed, Jun 17, 2015 at 10:27:58PM -0400, Mike Rappazzo wrote:
> >
> > I feel that the auto-merge takes away the context of the changes.
> >
> > I use araxis merge as my mergetool of choice. I almost always immediately
> > undo the auto-mer
On Wed, Jun 17, 2015 at 10:27:58PM -0400, Mike Rappazzo wrote:
> On Wed, Jun 17, 2015 at 3:41 PM, Junio C Hamano wrote:
> > Michael Rappazzo writes:
> >
> >> For some mergetools, the current invocation of git mergetool will
> >> include an auto-merge flag. By default the flag is included, howeve
On Wed, Jun 17, 2015 at 3:41 PM, Junio C Hamano wrote:
> Michael Rappazzo writes:
>
>> For some mergetools, the current invocation of git mergetool will
>> include an auto-merge flag. By default the flag is included, however if
>> the git config option 'merge.automerge' is set to 'false', then t
Michael Rappazzo writes:
> For some mergetools, the current invocation of git mergetool will
> include an auto-merge flag. By default the flag is included, however if
> the git config option 'merge.automerge' is set to 'false', then that
> flag will now be omitted.
... and why is the "automerge
During conflict resolution, invoking a mergetool which supports
auto-merge will pass that option by default to the underlying tool.
This patch is intended to allow one to set 'merge.automerge' to
'false' in order to override this behavior.
Michael Rappazzo (1):
mergetools: add config option to
For some mergetools, the current invocation of git mergetool will
include an auto-merge flag. By default the flag is included, however if
the git config option 'merge.automerge' is set to 'false', then that
flag will now be omitted.
Signed-off-by: Michael Rappazzo
---
Documentation/config.txt
6 matches
Mail list logo
