Re: [git-users] Overriding the "git merge" command

2016-08-04 Thread Guilherme Cavalcanti
Nice. Many thanks. I'll give it a try and inform here..

Em quinta-feira, 4 de agosto de 2016 13:15:57 UTC-3, Konstantin Khomoutov 
escreveu:
>
> On Thu, 4 Aug 2016 08:33:57 -0700 (PDT) 
> Guilherme Cavalcanti  wrote: 
>
> > I am a PhD candidate researching about merge tools and doing 
> > experiments with git and github. 
> > I know that when the *git merge* command fails in presence of 
> > conflicts, it is possible to invoke external merge tools through the 
> > command* git mergetool* to resolve conflicts. 
> > I was wondering if is that possible to set the *git merge* command to 
> > call the external merge tool directly, in any situation, not only 
> > when there are conflicts. 
> > More specifically, as far as I know, the workflow is: 
> > 
> >1. call "git merge" 
> >2. if there is conflict, call "git mergetool" to invoke an 
> > external merge tool 
> > 
> > What I want is: 
> > 
> > 
> >1. call "git merge" to invoke an external merge tool 
> > 
> > Is that possible? If so, how? 
>
> Supposedly yes -- via the so called "git attributes" 
> (run `git help attributes` to see the manual page). 
> One of the supported attributes is the "merge driver" which might be 
> set to a program to be invoked to perform a merge. 
>
> I don't know if it's possible (or has any sense) to invoke an 
> interactive application through this mechanics, though. 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Overriding the "git merge" command

2016-08-04 Thread Konstantin Khomoutov
On Thu, 4 Aug 2016 08:33:57 -0700 (PDT)
Guilherme Cavalcanti  wrote:

> I am a PhD candidate researching about merge tools and doing
> experiments with git and github.
> I know that when the *git merge* command fails in presence of
> conflicts, it is possible to invoke external merge tools through the
> command* git mergetool* to resolve conflicts.
> I was wondering if is that possible to set the *git merge* command to
> call the external merge tool directly, in any situation, not only
> when there are conflicts. 
> More specifically, as far as I know, the workflow is:
> 
>1. call "git merge"
>2. if there is conflict, call "git mergetool" to invoke an
> external merge tool
> 
> What I want is:
> 
> 
>1. call "git merge" to invoke an external merge tool
> 
> Is that possible? If so, how?

Supposedly yes -- via the so called "git attributes"
(run `git help attributes` to see the manual page).
One of the supported attributes is the "merge driver" which might be
set to a program to be invoked to perform a merge.

I don't know if it's possible (or has any sense) to invoke an
interactive application through this mechanics, though.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.