summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorDavid Kastrup <dak@gnu.org>2007-08-08 15:34:28 (GMT)
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-08-26 14:31:30 (GMT)
commit6e30fb0c3241ecdf1ac47c1495bc3b58a0dc6f05 (patch)
treecb1e1d14403ee7dbb09113c1b0ec2881954a86e9 /Documentation/user-manual.txt
parent0058a33a8eb5a8bfcfc5f5e769a2517cff4b73f1 (diff)
downloadgit-6e30fb0c3241ecdf1ac47c1495bc3b58a0dc6f05.zip
git-6e30fb0c3241ecdf1ac47c1495bc3b58a0dc6f05.tar.gz
git-6e30fb0c3241ecdf1ac47c1495bc3b58a0dc6f05.tar.bz2
Documentation/user-manual.txt: fix a few omissions of gitlink commands.
Signed-off-by: David Kastrup <dak@gnu.org>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt20
1 files changed, 11 insertions, 9 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 3d02198..5f7ecec 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1796,11 +1796,12 @@ taken from the message containing each patch.
Public git repositories
-----------------------
-Another way to submit changes to a project is to tell the maintainer of
-that project to pull the changes from your repository using git-pull[1].
-In the section "<<getting-updates-with-git-pull, Getting updates with
-git pull>>" we described this as a way to get updates from the "main"
-repository, but it works just as well in the other direction.
+Another way to submit changes to a project is to tell the maintainer
+of that project to pull the changes from your repository using
+gitlink:git-pull[1]. In the section "<<getting-updates-with-git-pull,
+Getting updates with git pull>>" we described this as a way to get
+updates from the "main" repository, but it works just as well in the
+other direction.
If you and the maintainer both have accounts on the same machine, then
you can just pull changes from each other's repositories directly;
@@ -2057,7 +2058,8 @@ $ cd work
Linus's tree will be stored in the remote branch named origin/master,
and can be updated using gitlink:git-fetch[1]; you can track other
public trees using gitlink:git-remote[1] to set up a "remote" and
-git-fetch[1] to keep them up-to-date; see <<repositories-and-branches>>.
+gitlink:git-fetch[1] to keep them up-to-date; see
+<<repositories-and-branches>>.
Now create the branches in which you are going to work; these start out
at the current tip of origin/master branch, and should be set up (using
@@ -2512,9 +2514,9 @@ $ gitk origin..mywork &
And browse through the list of patches in the mywork branch using gitk,
applying them (possibly in a different order) to mywork-new using
cherry-pick, and possibly modifying them as you go using commit --amend.
-The git-gui[1] command may also help as it allows you to individually
-select diff hunks for inclusion in the index (by right-clicking on the
-diff hunk and choosing "Stage Hunk for Commit").
+The gitlink:git-gui[1] command may also help as it allows you to
+individually select diff hunks for inclusion in the index (by
+right-clicking on the diff hunk and choosing "Stage Hunk for Commit").
Another technique is to use git-format-patch to create a series of
patches, then reset the state to before the patches: