From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <junkio@cox.net>,
"Martin Langhoff" <martin.langhoff@gmail.com>
Subject: Re: [PATCH] cvsserver: Make always-binary mode a config file option
Date: Thu, 1 Mar 2007 11:40:10 +0000 [thread overview]
Message-ID: <200703011140.11108.andyparkins@gmail.com> (raw)
In-Reply-To: <7vhct5rztc.fsf@assigned-by-dhcp.cox.net>
On Thursday 2007 March 01 11:03, Junio C Hamano wrote:
> 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"
I was part way through assembling a document when I read this; I hadn't
thought of the external merge option. I'll add that and send the document
soon.
Andy
--
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com
next prev parent reply other threads:[~2007-03-01 11:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-22 15:04 git-cvsserver and binary files Andy Parkins
2007-02-22 16:06 ` [PATCH] Added "-kb" to all the entries lines sent to the client Andy Parkins
2007-02-22 20:37 ` Junio C Hamano
2007-02-27 13:45 ` [PATCH] cvsserver: Make always-binary mode a config file option Andy Parkins
2007-02-28 11:36 ` Martin Langhoff
2007-02-28 13:01 ` Andy Parkins
2007-02-28 23:40 ` Martin Langhoff
2007-03-01 8:40 ` Andy Parkins
2007-03-01 9:13 ` Martin Langhoff
2007-03-01 9:41 ` Andy Parkins
2007-03-01 9:46 ` Junio C Hamano
2007-03-01 10:04 ` Junio C Hamano
2007-03-01 11:03 ` Junio C Hamano
2007-03-01 11:40 ` Andy Parkins [this message]
2007-03-01 11:44 ` Karl Hasselström
2007-02-27 13:46 ` Andy Parkins
2007-02-27 23:56 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200703011140.11108.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=martin.langhoff@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).