mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user-manual: reindent

Browse Source 
Just some minor reindenting

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields
2007-01-14 16:29:40 -05:00
parent f1d2b47794
commit 69f7ad730a
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Documentation/user-manual.txt
View File

@ -779,10 +779,10 @@ in history.
$ git diff origin..master $ git diff origin..master
------------------------------------------------- -------------------------------------------------
will tell you whether the contents of the project are the same at the two will tell you whether the contents of the project are the same at the
branches; in theory, however, it's possible that the same project contents two branches; in theory, however, it's possible that the same project
could have been arrived at by two different historical routes. You could contents could have been arrived at by two different historical
compare the SHA1 id's: routes. You could compare the SHA1 id's:
------------------------------------------------- -------------------------------------------------
$ git rev-list origin $ git rev-list origin
@ -791,8 +791,9 @@ $ git rev-list master
e05db0fd4f31dde7005f075a84f96b360d05984b e05db0fd4f31dde7005f075a84f96b360d05984b
------------------------------------------------- -------------------------------------------------
Or you could recall that the ... operator selects all commits contained Or you could recall that the ... operator selects all commits
reachable from either one reference or the other but not both: so contained reachable from either one reference or the other but not
both: so
------------------------------------------------- -------------------------------------------------
$ git log origin...master $ git log origin...master
@ -803,9 +804,21 @@ will return no commits when the two branches are equal.
Check which tagged version a given fix was first included in Check which tagged version a given fix was first included in
------------------------------------------------------------ ------------------------------------------------------------
Suppose you know that a critical fix made it into the linux kernel with commit Suppose you know that the commit e05db0fd fixed a certain problem.
e05db0fd... You'd like to find which kernel version that commit first made it You'd like to find the earliest tagged release that contains that
into. fix.
Of course, there may be more than one answer--if the history branched
after commit e05db0fd, then there could be multiple "earliest" tagged
releases.
You could just visually inspect the commits since e05db0fd:
-------------------------------------------------
$ gitk e05db0fd..
-------------------------------------------------
...
Developing with git Developing with git
=================== ===================