X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Ftutorial.txt;h=928a22cd7844cb4e2754f3d0b7d7870a5b1b14ff;hb=e1ccf53a60657930ae7892387736c8b6a91ec610;hp=c938bbc372221571a1a58dcd98bb2aadd9be4a21;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index c938bbc3..928a22cd 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -608,11 +608,11 @@ The above can also be written as simply git reset and in fact a lot of the common git command combinations can be scripted -with the `git xyz` interfaces, and you can learn things by just looking -at what the `git-*-script` scripts do (`git reset` is the above two lines -implemented in `git-reset`, but some things like `git status` and -`git commit` are slightly more complex scripts around the basic git -commands). +with the `git xyz` interfaces. You can learn things by just looking +at what the various git scripts do. For example, `git reset` is the +above two lines implemented in `git-reset`, but some things like +`git status` and `git commit` are slightly more complex scripts around +the basic git commands. Many (most?) public remote repositories will not contain any of the checked out files or even an index file, and will *only* contain the @@ -742,7 +742,7 @@ git commit -m 'Some work.' hello ------------------------------------------------ Here, we just added another line to `hello`, and we used a shorthand for -both going a `git-update-index hello` and `git commit` by just giving the +doing both `git-update-index hello` and `git commit` by just giving the filename directly to `git commit`. The `-m` flag is to give the commit log message from the command line. @@ -828,7 +828,7 @@ which will very loudly warn you that you're now committing a merge (which is correct, so never mind), and you can write a small merge message about your adventures in git-merge-land. -After you're done, start up `gitk --all` to see graphically what the +After you're done, start up `gitk \--all` to see graphically what the history looks like. Notice that `mybranch` still exists, and you can switch to it, and continue to work with it if you want to. The `mybranch` branch will not contain the merge, but next time you merge it @@ -883,7 +883,7 @@ not actually do a merge. Instead, it just updated the top of the tree of your branch to that of the `master` branch. This is often called 'fast forward' merge. -You can run `gitk --all` again to see how the commit ancestry +You can run `gitk \--all` again to see how the commit ancestry looks like, or run `show-branch`, which tells you this. ------------------------------------------------