> Quoting Junio C Hamano <junkio@xxxxxxx>: > Subject: Re: git rebase: unexpected conflict > > "Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx> writes: > > >> > git-show can not limit its output to just the part of patch > >> > that affects the list of files I give, the way git-diff can. > >> > Would such an extension be a good idea? > >> > >> It is a good idea and I think it is implemented. > >> > >> $ git-show <commit>... --- <paths> > > > > Yes, this works. But this seems undocumented. Right? > > Somehow I think I saw Linus's answer to this exact topic a few > hours ago. > > This manual page describes only the most frequently used options. Yes but Linus discussed git-log, which is both complete and correct. Unlike git-log, the man page foor git-show is correct but incomplete: It does say > This manual page describes only the most frequently used options. However where git-log man page says: ----- The command takes options applicable to the git-rev-list(1) command to control what is shown and how, and options applicable to the git-diff-tree(1) commands to control how the change each commit introduces are shown. ----- man git-show says nothing of the kind. ------------------------------------------------------------------- Junio, is the following patch correct? Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxxxxxx> --- diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index b802946..361eaec 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -16,7 +16,7 @@ Shows the commit logs. The command takes options applicable to the gitlink:git-rev-list[1] command to control what is shown and how, and options applicable to -the gitlink:git-diff-tree[1] commands to control how the change +the gitlink:git-diff-tree[1] commands to control how the changes each commit introduces are shown. This manual page describes only the most frequently used options. diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index 9051951..f56f164 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -25,6 +25,9 @@ with \--name-only). For plain blobs, it shows the plain contents. +The command takes options applicable to the gitlink:git-diff-tree[1] command to +control how the changes the commit introduces are shown. + This manual page describes only the most frequently used options. -- MST - 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