From: Benoit SIGOURE <tsuna@lrde.epita.fr>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git list <git@vger.kernel.org>
Subject: Re: git: avoiding merges, rebasing
Date: Tue, 9 Oct 2007 20:06:59 +0200 [thread overview]
Message-ID: <AAC50815-7438-4934-81EC-02EE08B38854@lrde.epita.fr> (raw)
In-Reply-To: <Pine.LNX.4.64.0710091141440.4174@racer.site>
[-- Attachment #1: Type: text/plain, Size: 681 bytes --]
On Oct 9, 2007, at 12:43 PM, Johannes Schindelin wrote:
> Hi,
>
> On Mon, 8 Oct 2007, Benoit SIGOURE wrote:
>
>> [as usual, I forgot the attachment...]
>
> Two comments:
>
> - by not inlining you made it hard to review your script. Therefore I
> will not do it.
:|
>
> - Try to avoid naming the script git-merge-*; these scripts/
> programs are
> merge _strategies_, not merge _drivers_ (and yes, we already have
> two
> programs violating this rule -- merge-base and merge-file -- but
> that
> does not mean that you are free to add to the pile).
I'm open to better suggestions.
Cheers,
--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 186 bytes --]
next prev parent reply other threads:[~2007-10-09 18:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200709301421.52192.bruno@clisp.org>
[not found] ` <200710020347.43733.bruno@clisp.org>
[not found] ` <4AD64749-F4A3-4A61-B1EE-D12523293661@lrde.epita.fr>
[not found] ` <200710021350.54625.bruno@clisp.org>
2007-10-02 12:16 ` git: avoiding merges, rebasing Eric Blake
2007-10-03 21:31 ` making "git stash" safer to use Bruno Haible
2007-10-03 21:36 ` Junio C Hamano
2007-10-04 8:40 ` Joachim B Haga
2007-10-04 20:59 ` David Kastrup
2007-10-19 13:37 ` stash clear, was Re: git: avoiding merges, rebasing Johannes Schindelin
2007-10-23 8:55 ` Miles Bader
[not found] ` <6C9F1445-8826-4E6F-A10C-290A57A4C826@lrde.epita.fr>
2007-10-03 23:01 ` Bruno Haible
[not found] ` <46FF99E2.8050605@byu.net>
[not found] ` <200709302141.25597.bruno@clisp.org>
[not found] ` <C64152A3-A5A6-4320-864C-E78E3A60C8E6@lrde.epita.fr>
2007-10-08 13:16 ` Benoit SIGOURE
2007-10-08 13:17 ` Benoit SIGOURE
2007-10-09 10:43 ` Johannes Schindelin
2007-10-09 18:06 ` Benoit SIGOURE [this message]
2007-10-09 12:03 ` Bruno Haible
2007-10-09 18:19 ` GNU-style ChangeLog merge driver for Git (was: Re: git: avoiding merges, rebasing) Benoit SIGOURE
2007-10-09 19:38 ` GNU-style ChangeLog merge driver for Git Bruno Haible
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AAC50815-7438-4934-81EC-02EE08B38854@lrde.epita.fr \
--to=tsuna@lrde.epita.fr \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).