On Thursday, March 28, 2013 12:41:49 PM UTC+1, Jaume Casado Ruiz wrote: > > Hi all! > > With *Git 1.7.9.5*, I am trying to configure a merge tool that should > apply only on .po/.pot (gettext) files. I have this config for acomplish > the same for merge/diff: > > In .gitattributes: > > *.po merge=pofile > *.pot merge=pofile > *.po diff=pofile > *.pot diff=pofile > > > In .gitconfig: > > [merge "pofile"] > name = Gettext merge driver > driver = git merge-po %O %A %B > > [diff "pofile"] > textconv = git diff-po > > > Where git-merge-po and git-diff-po are custom scripts located in ~/bin. > > Is it possible to do the same for the mergetool configs? I don't know > wether this is implemented or not, neither I need to configure this in > another manner. For exemple, I'm trying: > > In .gitattributes: > > *.po mergetool=pofile > > *.pot mergetool=pofile > > > In .gitconfig: > > [mergetool "pofile"] > > cmd = git mergetool-po \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" > > > But it doesn't work. Now I'm using manually this command "git mergetool > -t pofile" for resolving conflicts between .po files, but I thought that > could just type "git mergetool" and the git itself will launch > automatically my "pofile" mergetool for .po/.pot files and the > project/globally defined mergetool for the rest of files. > > Any idea? >
This sounds like a question for the Git developer list: https://gist.github.com/tfnico/4441562 -- 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/groups/opt_out.
