core-tutorial: Catch up with current Git
No longer talk about Cogito since it's deprecated. Some scripts (such as git-reset or git-branch) have undergone builtinification so adjust the text to reflect this. Fix a typo in the description of git-show-branch (merges are indicated by a `-', not by a `.'). git-pull/git-push do not seem to use the dumb git-ssh-fetch/git-ssh-upload (the text was probably missing a word). Adjust a link that wasn't rendered properly because it was wrapped. Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Benoit Sigoure committed
Oct 29, 2007 at 08:00 UTC
3b27428b9d3d8dc1c3f00da0ab94a1c7555a9265
1 file changed
+10
-16
Documentation/core-tutorial.txt
+10
-16
@@ -553,13 +553,8 @@ can explore on your own.
553
554
[NOTE]
555
Most likely, you are not directly using the core
556
-git Plumbing commands, but using Porcelain like Cogito on top
557
-of it. Cogito works a bit differently and you usually do not
558
-have to run `git-update-index` yourself for changed files (you
559
-do tell underlying git about additions and removals via
560
-`cg-add` and `cg-rm` commands). Just before you make a commit
561
-with `cg-commit`, Cogito figures out which files you modified,
562
-and runs `git-update-index` on them for you.
556
+git Plumbing commands, but using Porcelain such as `git-add`, `git-rm'
557
+and `git-commit'.
558
559
560
Tagging a version
@@ -686,8 +681,8 @@ $ git reset
681
682
and in fact a lot of the common git command combinations can be scripted
683
with the `git xyz` interfaces. You can learn things by just looking
689
-at what the various git scripts do. For example, `git reset` is the
690
-above two lines implemented in `git-reset`, but some things like
684
+at what the various git scripts do. For example, `git reset` used to be
685
+the above two lines implemented in `git-reset`, but some things like
686
`git status` and `git commit` are slightly more complex scripts around
687
the basic git commands.
688
@@ -805,8 +800,8 @@ you have, you can say
800
$ git branch
801
------------
802
808
-which is nothing more than a simple script around `ls .git/refs/heads`.
809
-There will be asterisk in front of the branch you are currently on.
803
+which used to be nothing more than a simple script around `ls .git/refs/heads`.
804
+There will be an asterisk in front of the branch you are currently on.
805
806
Sometimes you may wish to create a new branch _without_ actually
807
checking it out and switching to it. If so, just use the command
@@ -952,7 +947,7 @@ the later output lines is used to show commits contained in the
947
`master` branch, and the second column for the `mybranch`
948
branch. Three commits are shown along with their log messages.
949
All of them have non blank characters in the first column (`*`
955
-shows an ordinary commit on the current branch, `.` is a merge commit), which
950
+shows an ordinary commit on the current branch, `-` is a merge commit), which
951
means they are now part of the `master` branch. Only the "Some
952
work" commit has the plus `+` character in the second column,
953
because `mybranch` has not been merged to incorporate these
@@ -1086,7 +1081,7 @@ to help dumb transport downloaders.
1081
There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload`
1082
programs, which are 'commit walkers'; they outlived their
1083
usefulness when git Native and SSH transports were introduced,
1089
-and not used by `git pull` or `git push` scripts.
1084
+and are not used by `git pull` or `git push` scripts.
1085
1086
Once you fetch from the remote repository, you `merge` that
1087
with your current branch.
@@ -1193,7 +1188,7 @@ $ mb=$(git-merge-base HEAD mybranch)
1188
1189
The command writes the commit object name of the common ancestor
1190
to the standard output, so we captured its output to a variable,
1196
-because we will be using it in the next step. BTW, the common
1191
+because we will be using it in the next step. By the way, the common
1192
ancestor commit is the "New day." commit in this case. You can
1193
tell it by:
1194
@@ -1459,8 +1454,7 @@ Although git is a truly distributed system, it is often
1454
convenient to organize your project with an informal hierarchy
1455
of developers. Linux kernel development is run this way. There
1456
is a nice illustration (page 17, "Merges to Mainline") in
1462
-link:http://www.xenotime.net/linux/mentor/linux-mentoring-2006.pdf
1463
-[Randy Dunlap's presentation].
1457
+link:http://www.xenotime.net/linux/mentor/linux-mentoring-2006.pdf[Randy Dunlap's presentation].
1458
1459
It should be stressed that this hierarchy is purely *informal*.
1460
There is nothing fundamental in git that enforces the "chain of