Re: [PATCH] cvsserver: Make always-binary mode a config file option
- From
Junio C Hamano <junkio@cox.net>
- Date
- Mar 1, 2007, 11:03 UTC
- Message-ID
- <7vhct5rztc.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7vr6s9th4f.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
Show 19 quoted lines
> we should make two kinds of configuration. Classification of > paths is property of the project and does not depend on where > the user uses the paths from the project: > ... > while how they are handled can be platform dependent. On UNIX, > you might have this in $HOME/.gitconfig: > > [handler "a/v"] > pretty = "cmd xine %s" ; nb. there is no 'cmd' yet... > [handler "text"] > pretty = "pipe fmt -" > > while on another system, you might have: > > [handler "a/v"] > pretty = "cmd mediaplayer %s" > [handler "text"] > conv_i = crlf > conv_o = crlf
Once we separate out the handler section, we can introduce more useful variables in it (not the "pretty", whose sole purpose was to have fun and serve as a demonstration). Obvious ones are:
; takes temporary files old, mine, his and writes the
; result in another
merge = "cmd external-merge-command %s %s %s %s" ; takes two temporary files
diff = "cmd external-diff-command %s %s"