From: Junio C Hamano Date: Sat, 09 Aug 2008 20:07:50 GMT Subject: Re: [PATCH 2/3] Teach git diff-tree --stdin to diff trees Message-ID: <7viqua54vd.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080809095605.GA10804@diana.vm.bytemark.co.uk> Karl Hasselström writes: > On 2008-08-08 14:22:45 -0700, Junio C Hamano wrote: > ... >> But the following two sentences are a bit confusing, especially it >> is unclear what "This" refers to in the last sentence. >> >> > When diffing trees, the -m, -s, -v, --pretty, --abbrev-commit, >> > --encoding, --no-commit-id, -c, --cc, and --always options are >> > ignored, since they do not apply to trees. This is the same >> > behavior you get when specifying two trees on the command line >> > instead of with --stdin. >> >> Perhaps swap the sentences in the log message like this? >> >> When feeding trees on the command line, you can give exactly two >> trees, not three nor one; --stdin now supports this "two tree" >> form on its input, in addition to accepting lines with one or more >> commits. >> >> When diffing trees (either specified on the command line or from >> the standard input), the -m, -s, -v, --pretty, --abbrev-commit, >> --encoding, --no-commit-id, -c, --cc, and --always options are >> ignored, since they do not apply to trees. > > Will do. Thanks. Thinking about it a bit more, -m, -c and --cc are not about commits at all. Your excuse not to support them is because these three are about diffing more than two trees (and I'd say that is still a good rationale).