From 35bd025124fba3077f85bdc1fdd3a2902b5ed8bc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Jan 2007 05:40:22 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc1-gc1a42 --- git-commit.html | 2 +- git-commit.txt | 5 ----- tutorial.html | 45 +++++++++++++++++++++++++-------------------- tutorial.txt | 45 +++++++++++++++++++++++++-------------------- 4 files changed, 51 insertions(+), 46 deletions(-) diff --git a/git-commit.html b/git-commit.html index d3ac685e89..efc2844770 100644 --- a/git-commit.html +++ b/git-commit.html @@ -651,7 +651,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index b4528d72ba..6139386ad7 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -142,11 +142,6 @@ $ git add hello.c $ git commit ------------ -//////////// -We should fix 'git rm' to remove goodbye.c from both index and -working tree for the above example. -//////////// - Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in diff --git a/tutorial.html b/tutorial.html index c6b5ff62a8..196b28e38a 100644 --- a/tutorial.html +++ b/tutorial.html @@ -516,40 +516,45 @@ then she may need to manually fix any conflicts. (Note that the is the default.)

The "pull" command thus performs two operations: it fetches changes from a remote branch, then merges them into the current branch.

-

You can perform the first operation alone using the "git fetch" -command. For example, Alice could create a temporary branch just to -track Bob's changes, without merging them with her own, using:

+

When you are working in a small closely knit group, it is not +unusual to interact with the same repository over and over +again. By defining remote repository shorthand, you can make +it easier:

-
$ git fetch /home/bob/myrepo master:bob-incoming
+
$ git remote add bob /home/bob/myrepo
-

which fetches the changes from Bob's master branch into a new branch -named bob-incoming. Then

+

With this, you can perform the first operation alone using the +"git fetch" command without merging them with her own branch, +using:

-
$ git log -p master..bob-incoming
+
$ git fetch bob
+
+

Unlike the longhand form, when Alice fetches from Bob using a +remote repository shorthand set up with git remote, what was +fetched is stored in a remote tracking branch, in this case +bob/master. So after this:

+
+
+
$ git log -p master..bob/master

shows a list of all the changes that Bob made since he branched from Alice's master branch.

-

After examining those changes, and possibly fixing things, Alice +

After examining those changes, Alice could merge the changes into her master branch:

-
$ git checkout master
-$ git merge bob-incoming
+
$ git merge bob/master
-

The last command is a merge from the "bob-incoming" branch in Alice's -own repository.

-

Alice could also perform both steps at once with:

+

This merge can also be done by pulling from her own remote +tracking branch, like this:

-
$ git pull /home/bob/myrepo master:bob-incoming
+
$ git pull . remotes/bob/master
-

This is just like the "git pull /home/bob/myrepo master" that we saw -before, except that it also stores the unmerged changes from bob's -master branch in bob-incoming before merging them into Alice's -current branch. Note that git pull always merges into the current -branch, regardless of what else is given on the commandline.

+

Note that git pull always merges into the current branch, +regardless of what else is given on the commandline.

Later, Bob can update his repo with Alice's latest changes using

@@ -783,7 +788,7 @@ digressions that may be interesting at this point are:

diff --git a/tutorial.txt b/tutorial.txt index 8325c5e53a..c27a4505d4 100644 --- a/tutorial.txt +++ b/tutorial.txt @@ -295,46 +295,51 @@ is the default.) The "pull" command thus performs two operations: it fetches changes from a remote branch, then merges them into the current branch. -You can perform the first operation alone using the "git fetch" -command. For example, Alice could create a temporary branch just to -track Bob's changes, without merging them with her own, using: +When you are working in a small closely knit group, it is not +unusual to interact with the same repository over and over +again. By defining 'remote' repository shorthand, you can make +it easier: + +------------------------------------------------ +$ git remote add bob /home/bob/myrepo +------------------------------------------------ + +With this, you can perform the first operation alone using the +"git fetch" command without merging them with her own branch, +using: ------------------------------------- -$ git fetch /home/bob/myrepo master:bob-incoming +$ git fetch bob ------------------------------------- -which fetches the changes from Bob's master branch into a new branch -named bob-incoming. Then +Unlike the longhand form, when Alice fetches from Bob using a +remote repository shorthand set up with `git remote`, what was +fetched is stored in a remote tracking branch, in this case +`bob/master`. So after this: ------------------------------------- -$ git log -p master..bob-incoming +$ git log -p master..bob/master ------------------------------------- shows a list of all the changes that Bob made since he branched from Alice's master branch. -After examining those changes, and possibly fixing things, Alice +After examining those changes, Alice could merge the changes into her master branch: ------------------------------------- -$ git checkout master -$ git merge bob-incoming +$ git merge bob/master ------------------------------------- -The last command is a merge from the "bob-incoming" branch in Alice's -own repository. - -Alice could also perform both steps at once with: +This `merge` can also be done by 'pulling from her own remote +tracking branch', like this: ------------------------------------- -$ git pull /home/bob/myrepo master:bob-incoming +$ git pull . remotes/bob/master ------------------------------------- -This is just like the "git pull /home/bob/myrepo master" that we saw -before, except that it also stores the unmerged changes from bob's -master branch in bob-incoming before merging them into Alice's -current branch. Note that git pull always merges into the current -branch, regardless of what else is given on the commandline. +Note that git pull always merges into the current branch, +regardless of what else is given on the commandline. Later, Bob can update his repo with Alice's latest changes using -- 2.34.1