From: Linus Torvalds <torvalds@osdl.org>
To: Marco Costalba <mcostalba@gmail.com>
Cc: Junio C Hamano <junkio@cox.net>,
Git Mailing List <git@vger.kernel.org>,
Paul Mackerras <paulus@samba.org>,
Marco Costalba <mcostalba@yahoo.it>,
Aneesh Kumar <aneesh.kumar@gmail.com>
Subject: Re: The merge from hell...
Date: Thu, 2 Feb 2006 00:02:04 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602012356131.21884@g5.osdl.org> (raw)
In-Reply-To: <e5bfff550602012325s7d0a799ct5bfabbce2c579449@mail.gmail.com>
On Thu, 2 Feb 2006, Marco Costalba wrote:
>
> Currently the public git repo version of qgit uses "git-diff-tree -c"
> for merges, It's not a problem to change qgit to use --cc option
> instead. But I would like to use just one kind of option to filter
> merges files.
I think using "-c" rather than "--cc" is fine, and if it makes parsing
easier..
The "--cc" option should show less "noise", an dI'm actually arguing that
it should show even less than it does now (for when the branches agreed
with each other, and there was no actual conflict, which is what I think
is more useful), but I don't think "-c" is _wrong_ either.
Using "-c" is a strange kind of "show all differences in a file that had
file-level merges" while at least to me "--cc" is meant to be more of a
"show all actual file-level CONFLICTS where the merge actually did
something different"
Linus
next prev parent reply other threads:[~2006-02-02 8:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-02 6:28 The merge from hell Linus Torvalds
2006-02-02 7:05 ` Junio C Hamano
2006-02-02 7:40 ` [PATCH] combine-diff: reuse diff from the same blob Junio C Hamano
2006-02-02 7:51 ` The merge from hell Linus Torvalds
2006-02-02 7:55 ` Linus Torvalds
2006-02-02 8:08 ` Linus Torvalds
2006-02-02 8:18 ` [PATCH] combine-diff: update --cc "uninteresting hunks" logic Junio C Hamano
2006-02-02 9:34 ` [PATCH] combine-diff: add safety check to --cc Junio C Hamano
2006-02-02 23:03 ` Linus Torvalds
2006-02-03 0:02 ` Junio C Hamano
2006-02-03 1:05 ` Linus Torvalds
2006-02-03 5:49 ` [Attn - repository browser authors] diff-tree combined format Junio C Hamano
2006-02-03 12:17 ` Marco Costalba
2006-02-03 19:55 ` Junio C Hamano
2006-02-03 21:35 ` Junio C Hamano
2006-02-04 12:03 ` Marco Costalba
2006-02-04 11:23 ` Paul Mackerras
2006-02-03 5:28 ` [PATCH] combine-diff: add safety check to --cc Junio C Hamano
2006-02-04 5:38 ` Paul Mackerras
2006-02-04 6:12 ` Junio C Hamano
2006-02-04 10:46 ` The merge from hell Paul Mackerras
2006-02-04 12:22 ` Junio C Hamano
2006-02-04 19:42 ` Linus Torvalds
2006-02-04 20:59 ` Linus Torvalds
2006-02-02 7:25 ` Marco Costalba
2006-02-02 8:02 ` Linus Torvalds [this message]
2006-02-02 8:07 ` Aneesh Kumar
2006-02-02 8:27 ` Junio C Hamano
2006-02-02 8:44 ` Linus Torvalds
2006-02-02 10:41 ` Junio C Hamano
2006-02-05 19:42 ` Linus Torvalds
2006-02-05 19:49 ` Add a "git show" command to show a commit Linus Torvalds
2006-02-05 19:58 ` Fix git-rev-parse over-eager errors Linus Torvalds
2006-02-05 20:11 ` Junio C Hamano
2006-02-05 22:03 ` Linus Torvalds
2006-02-06 6:20 ` Junio C Hamano
2006-02-05 22:45 ` Add a "git show" command to show a commit Junio C Hamano
2006-02-05 22:55 ` Linus Torvalds
2006-02-05 22:59 ` Linus Torvalds
2006-02-06 0:25 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2006-02-03 4:20 The merge from hell Brown, Len
2006-02-03 5:45 ` Linus Torvalds
2006-02-03 6:28 ` Junio C Hamano
2006-02-03 16:21 ` Dave Jones
2006-02-03 6:04 Brown, Len
2006-02-03 6:16 ` Linus Torvalds
2006-02-03 6:33 ` Junio C Hamano
2006-02-03 6:41 linux
2006-02-03 18:34 Brown, Len
2006-02-04 2:35 ` Junio C Hamano
2006-02-04 2:47 ` Linus Torvalds
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=Pine.LNX.4.64.0602012356131.21884@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=aneesh.kumar@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=mcostalba@gmail.com \
--cc=mcostalba@yahoo.it \
--cc=paulus@samba.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 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).