diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
| commit | 44dcd493a7896aabe2b48b0a2935633538d81f7c (patch) | |
| tree | 55fb9bfad3faa4309b5e1c0781f78d635c6dbd3b /user-manual.txt | |
| parent | bb300643ea913f58d836780e949b1ebcce8da530 (diff) | |
| download | git-htmldocs-44dcd493a7896aabe2b48b0a2935633538d81f7c.tar.gz | |
Autogenerated HTML docs for v1.7.12-rc0
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/user-manual.txt b/user-manual.txt index 02ed5668e..03d95dc29 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -2870,7 +2870,7 @@ $ git fetch example You can also add a "+" to force the update each time: ------------------------------------------------- -$ git config remote.example.fetch +master:ref/remotes/example/master +$ git config remote.example.fetch +master:refs/remotes/example/master ------------------------------------------------- Don't do this unless you're sure you won't mind "git fetch" possibly @@ -2966,7 +2966,7 @@ As you can see, a commit is defined by: - a tree: The SHA-1 name of a tree object (as defined below), representing the contents of a directory at a certain point in time. -- parent(s): The SHA-1 name of some number of commits which represent the +- parent(s): The SHA-1 name(s) of some number of commits which represent the immediately previous step(s) in the history of the project. The example above has one parent; merge commits may have more than one. A commit with no parents is called a "root" commit, and @@ -3363,8 +3363,8 @@ Date: :100644 100644 oldsha... 4b9458b... M somedirectory/myfile ------------------------------------------------ -This tells you that the immediately preceding version of the file was -"newsha", and that the immediately following version was "oldsha". +This tells you that the immediately following version of the file was +"newsha", and that the immediately preceding version was "oldsha". You also know the commit messages that went with the change from oldsha to 4b9458b and with the change from 4b9458b to newsha. @@ -4035,8 +4035,8 @@ $ git ls-files --unmerged Each line of the `git ls-files --unmerged` output begins with the blob mode bits, blob SHA-1, 'stage number', and the filename. The 'stage number' is git's way to say which tree it -came from: stage 1 corresponds to `$orig` tree, stage 2 `HEAD` -tree, and stage3 `$target` tree. +came from: stage 1 corresponds to the `$orig` tree, stage 2 to +the `HEAD` tree, and stage 3 to the `$target` tree. Earlier we said that trivial merges are done inside `git read-tree -m`. For example, if the file did not change |