From: Pat Thoyts <patthoyts@users•sourceforge.net>
To: Junio C Hamano <gitster@pobox•com>
Cc: Sebastian Schuberth <sschuberth@gmail•com>,
git@vger•kernel.org, Chris Packham <judge.packham@gmail•com>,
charles@hashpling•org
Subject: Re: [PATCH 0/2 v2] Adding Beyond Compare as a merge tool
Date: Wed, 02 Mar 2011 00:28:06 +0000 [thread overview]
Message-ID: <87hbbmqsbt.fsf@fox.patthoyts.tk> (raw)
In-Reply-To: <7voc5wk5wl.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Sun, 27 Feb 2011 22:52:10 -0800")
Junio C Hamano <gitster@pobox•com> writes:
>Sebastian Schuberth <sschuberth@gmail•com> writes:
>
>> Sebastian Schuberth (2):
>> mergetool--lib: Sort tools alphabetically for easier lookup
>> mergetool--lib: Add Beyond Compare 3 as a tool
>>
>> Documentation/git-difftool.txt | 4 +-
>> Documentation/git-mergetool.txt | 4 +-
>> Documentation/merge-config.txt | 8 +-
>> contrib/completion/git-completion.bash | 2 +-
>> git-gui/lib/mergetool.tcl | 101 +++++++------
>> git-mergetool--lib.sh | 247 +++++++++++++++++---------------
>> 6 files changed, 195 insertions(+), 171 deletions(-)
>
>Hmm, I really would have liked if you took the hint and separated git-gui
>bits into separate patches.
>
>I saw Tested-by from Chris, so I'll add that to what is queued on 'pu',
>ask Pat to keep an eye on the ss/git-gui-mergetool branch, and then merge
>my ss/mergetool--lib branch to 'master' during my next integration run.
Where is this branch?
--
Pat Thoyts http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD
next prev parent reply other threads:[~2011-03-02 0:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-27 11:28 [PATCH 0/2 v2] Adding Beyond Compare as a merge tool Sebastian Schuberth
2011-02-27 11:31 ` [PATCH 1/2 v2] mergetool--lib: Sort tools alphabetically for easier lookup Sebastian Schuberth
2011-02-27 11:32 ` [PATCH 2/2 v2] mergetool--lib: Add Beyond Compare 3 as a tool Sebastian Schuberth
2011-02-28 6:15 ` Chris Packham
2011-02-28 6:25 ` Sebastian Schuberth
2011-02-28 6:52 ` [PATCH 0/2 v2] Adding Beyond Compare as a merge tool Junio C Hamano
2011-02-28 7:02 ` Sebastian Schuberth
2011-03-02 0:28 ` Pat Thoyts [this message]
2011-03-02 4:26 ` 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=87hbbmqsbt.fsf@fox.patthoyts.tk \
--to=patthoyts@users$(echo .)sourceforge.net \
--cc=charles@hashpling$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=judge.packham@gmail$(echo .)com \
--cc=sschuberth@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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