On 2008-08-08 14:22:45 -0700, Junio C Hamano wrote:
> Karl Hasselström <kha@xxxxxxxxxxx> writes:
>
> > In addition to accepting lines with one or more commits, it now
> > accepts lines with precisely two trees.
>
> Hmm, slightly dissapointed (I actually was hoping you would also
> handle more than two trees and run -m or -c or --cc on them).
I decided to not attempt that -- I'm unsure enough of my git
programming skills that I decided the smaller jump would provide
sufficient material for constructive criticism. And, perhaps more
importantly, I personally don't have a need for anything beyond what I
implemented. (And, I'm not burning any bridges -- the multiple-tree
forms can be added in the future. Along with handling them on the
command line too, hopefully.)
> 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.
> Thanks, now we can update that documentation change.
I think your doc patch is obsoleted by my patch. I'll make sure it's
all taken care of in the resend.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
