From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: gitweb using "--cc"?
Date: Thu, 9 Feb 2006 08:42:39 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602090838460.2458@g5.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0602090822100.2458@g5.osdl.org>
On Thu, 9 Feb 2006, Linus Torvalds wrote:
>
> This is a first try at it.
Btw, if it wasn't clear, this patch _does_ fix the fact that
"git-whatchanged" didn't show merges even if they have conflicts.
Of course, since the raw format is equivalent to "-c" and only bases its
"should I show" logic on whether the file has changed at all, it very
fundamentally will never be able to tell the difference between a real
content conflict and something that just had file-level automatic merging.
So "git-whatchanged" will now show a lot of merges that didn't really
change anything, but that just merged on a file level (ie the whole merge
just goes away when you specify "--cc").
Still, that's actually interesting information too, so you can consider
this a feature.
Linus
next prev parent reply other threads:[~2006-02-09 16:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-08 23:44 gitweb using "--cc"? Linus Torvalds
2006-02-08 23:57 ` Junio C Hamano
2006-02-09 0:01 ` [PATCH] Use describe to come up with the closest tag Junio C Hamano
2006-02-09 0:02 ` [PATCH] Allow using --cc when showing a merge Junio C Hamano
2006-02-09 2:13 ` gitweb using "--cc"? Brian Gerst
2006-02-09 2:26 ` Linus Torvalds
2006-02-09 3:14 ` Junio C Hamano
2006-02-09 16:35 ` Linus Torvalds
2006-02-09 16:42 ` Linus Torvalds [this message]
2006-02-09 18:30 ` Linus Torvalds
2006-02-09 19:41 ` Junio C Hamano
2006-02-09 20:27 ` Linus Torvalds
2006-02-09 20:37 ` Linus Torvalds
2006-02-09 20:47 ` Junio C Hamano
2006-02-09 20:52 ` Junio C Hamano
2006-02-09 21:53 ` Junio C Hamano
2006-02-09 22:00 ` Junio C Hamano
2006-02-09 22:26 ` Junio C Hamano
2006-02-11 9:17 ` Marco Costalba
2006-02-11 19:32 ` Junio C Hamano
2006-02-11 20:59 ` Junio C Hamano
2006-02-09 20:38 ` Junio C Hamano
2006-02-09 20:50 ` Linus Torvalds
2006-02-09 21:11 ` Junio C Hamano
2006-02-10 11:00 ` [PATCH] combine-diff: Record diff status a bit more faithfully Junio C Hamano
2006-02-09 23:49 ` [PATCH] combine-diff: move formatting logic to show_combined_diff() Junio C Hamano
2006-02-09 3:13 ` gitweb using "--cc"? Kay Sievers
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=Pine.LNX.4.64.0602090838460.2458@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).