Re: [PATCH] user-manual: Talk about tracking third-party snapshots
- From
- J. Bruce Fields <bfields@fieldses.org>
- Date
- Nov 19, 2007, 00:48 UTC
- Message-ID
- <20071119004828.GB23671@fieldses.org>
- In-Reply-To
- <11949569992214-git-send-email-msmith@cbnco.com>
On Tue, Nov 13, 2007 at 07:29:59AM -0500, Michael Smith wrote:
Show 11 quoted lines
> +You can view all your local changes--b, d, h, and i--with the > +gitlink:git-diff[1] command: > + > +------------------------------------------ > +$ git diff origin/master...master > +------------------------------------------ > + > +The three-dot `\...` tells gitlink:git-diff[1] to show the changes on the > +master branch since the last common ancestor with origin/master. (If you > +used two dots instead of three, you'd see the entire patch to go from > +origin/master to master, including reversing commits "f" and "g".)
I missed the "..." thing when on my first attempt at the manual. It really should be mentioned in the "Generating diffs" section; I've added the following to my
git://linux-nfs.org/~bfields/git.git maint
--b.
>From 5b98d9bca16e19710380d2d03f704de9eb98621d Mon Sep 17 00:00:00 2001
From: J. Bruce Fields <bfields@citi.umich.edu> Date: Sun, 18 Nov 2007 19:18:27 -0500 Subject: [PATCH] user-manual: mention "..." in "Generating diffs", etc.
We should mention the use of the "..." syntax for git-diff here. The note about the difference between diff and the combined output of git-format-patch then no longer fits so well, so remove it. Add a reference to the git-format-patch[1] manpage.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> --- Documentation/user-manual.txt | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index e399685..c027353 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -658,16 +658,23 @@ gitlink:git-diff[1]: $ git diff master..test ------------------------------------------------- -Sometimes what you want instead is a set of patches: +That will produce the diff between the tips of the two branches. If +you'd prefer to find the diff from their common ancestor to test, you +can use three dots instead of two: + +------------------------------------------------- +$ git diff master...test +------------------------------------------------- + +Sometimes what you want instead is a set of patches; for this you can +use gitlink:git-format-patch[1]: ------------------------------------------------- $ git format-patch master..test ------------------------------------------------- will generate a file with a patch for each commit reachable from test -but not from master. Note that if master also has commits which are -not reachable from test, then the combined result of these patches -will not be the same as the diff produced by the git-diff example. +but not from master. [[viewing-old-file-versions]] Viewing old file versions
-- 1.5.3.5.561.g140d