user-manual: reindent
Just some minor reindenting Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
J. Bruce Fields committed
Jan 14, 2007 at 16:29 UTC
69f7ad730a21eb7e8aeb22b2ee76856dff2b7bd2
1 file changed
+22
-9
Documentation/user-manual.txt
+22
-9
@@ -779,10 +779,10 @@ in history.
779
$ git diff origin..master
780
-------------------------------------------------
781
782
-will tell you whether the contents of the project are the same at the two
783
-branches; in theory, however, it's possible that the same project contents
784
-could have been arrived at by two different historical routes. You could
785
-compare the SHA1 id's:
782
+will tell you whether the contents of the project are the same at the
783
+two branches; in theory, however, it's possible that the same project
784
+contents could have been arrived at by two different historical
785
+routes. You could compare the SHA1 id's:
786
787
-------------------------------------------------
788
$ git rev-list origin
@@ -791,8 +791,9 @@ $ git rev-list master
791
e05db0fd4f31dde7005f075a84f96b360d05984b
792
-------------------------------------------------
793
794
-Or you could recall that the ... operator selects all commits contained
795
-reachable from either one reference or the other but not both: so
794
+Or you could recall that the ... operator selects all commits
795
+contained reachable from either one reference or the other but not
796
+both: so
797
798
-------------------------------------------------
799
$ git log origin...master
@@ -803,9 +804,21 @@ will return no commits when the two branches are equal.
804
Check which tagged version a given fix was first included in
805
------------------------------------------------------------
806
806
-Suppose you know that a critical fix made it into the linux kernel with commit
807
-e05db0fd... You'd like to find which kernel version that commit first made it
808
-into.
807
+Suppose you know that the commit e05db0fd fixed a certain problem.
808
+You'd like to find the earliest tagged release that contains that
809
+fix.
810
+
811
+Of course, there may be more than one answer--if the history branched
812
+after commit e05db0fd, then there could be multiple "earliest" tagged
813
+releases.
814
+
815
+You could just visually inspect the commits since e05db0fd:
816
+
817
+-------------------------------------------------
818
+$ gitk e05db0fd..
819
+-------------------------------------------------
820
+
821
+...
822
823
Developing with git
824
===================