From: Junio C Hamano <junkio@cox.net>
To: "Bertrand Jacquin" <beber.mailing@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-feed-mail-list.sh
Date: Mon, 08 May 2006 18:03:32 -0700 [thread overview]
Message-ID: <7vac9sc8m3.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <4fb292fa0605081755m22e8239cjda0b1ac74b84c0d9@mail.gmail.com> (Bertrand Jacquin's message of "Tue, 9 May 2006 02:55:48 +0200")
"Bertrand Jacquin" <beber.mailing@gmail.com> writes:
> Is there a way to track merge like that?
The command line you quoted shows the relevant information for
people who want to know what happened in that merge.
Namely:
* it always shows the header and the message
* it shows the changes that are not trivial (i.e. merge parents
have overlapping different versions and manual resolution
resulted in something different from either parents).
It is not a replacement for format-patch, but I think the commit
mailing list is not for machines to receive and apply the
received patches, but for humans to inspect, so it would be more
suitable than a naive alternative of showing diff from all
parents concatenated together.
next prev parent reply other threads:[~2006-05-09 1:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-03 17:48 git-feed-mail-list.sh David Woodhouse
2006-05-04 4:35 ` git-feed-mail-list.sh Junio C Hamano
2006-05-04 5:16 ` git-feed-mail-list.sh Junio C Hamano
2006-05-08 23:44 ` git-feed-mail-list.sh David Woodhouse
2006-05-09 0:19 ` git-feed-mail-list.sh Linus Torvalds
2006-05-09 0:28 ` git-feed-mail-list.sh David Woodhouse
2006-05-09 0:36 ` git-feed-mail-list.sh Junio C Hamano
2006-05-09 0:53 ` git-feed-mail-list.sh Bertrand Jacquin
2006-05-09 0:57 ` git-feed-mail-list.sh Junio C Hamano
2006-05-09 0:59 ` git-feed-mail-list.sh Bertrand Jacquin
2006-05-09 0:45 ` git-feed-mail-list.sh Linus Torvalds
2006-05-09 1:01 ` git-feed-mail-list.sh David Woodhouse
2006-05-09 1:05 ` git-feed-mail-list.sh Junio C Hamano
2006-05-09 1:12 ` git-feed-mail-list.sh David Woodhouse
2006-05-10 8:49 ` git-feed-mail-list.sh Martin Mares
2006-05-09 1:27 ` git-feed-mail-list.sh Linus Torvalds
2006-05-09 0:55 ` git-feed-mail-list.sh Bertrand Jacquin
2006-05-09 1:03 ` Junio C Hamano [this message]
2006-05-09 1:09 ` git-feed-mail-list.sh Bertrand Jacquin
2006-05-09 2:41 ` git-feed-mail-list.sh Junio C Hamano
2006-05-09 3:06 ` git-feed-mail-list.sh Linus Torvalds
2006-05-09 7:32 ` git-feed-mail-list.sh Junio C Hamano
2006-05-09 1:18 ` git-feed-mail-list.sh Linus Torvalds
2006-05-09 7:15 ` git-feed-mail-list.sh 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=7vac9sc8m3.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=beber.mailing@gmail.com \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.