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>
J. Bruce Fields committed
Nov 18, 2007 at 19:18 UTC
5b98d9bca16e19710380d2d03f704de9eb98621d
1 file changed
+11
-4
Documentation/user-manual.txt
+11
-4
@@ -658,16 +658,23 @@ gitlink:git-diff[1]:
658
$ git diff master..test
659
-------------------------------------------------
660
661
-Sometimes what you want instead is a set of patches:
661
+That will produce the diff between the tips of the two branches. If
662
+you'd prefer to find the diff from their common ancestor to test, you
663
+can use three dots instead of two:
664
+
665
+-------------------------------------------------
666
+$ git diff master...test
667
+-------------------------------------------------
668
+
669
+Sometimes what you want instead is a set of patches; for this you can
670
+use gitlink:git-format-patch[1]:
671
672
-------------------------------------------------
673
$ git format-patch master..test
674
-------------------------------------------------
675
676
will generate a file with a patch for each commit reachable from test
668
-but not from master. Note that if master also has commits which are
669
-not reachable from test, then the combined result of these patches
670
-will not be the same as the diff produced by the git-diff example.
677
+but not from master.
678
679
[[viewing-old-file-versions]]
680
Viewing old file versions