@matheusbsbs / matheus-bagliano / commits / 6e30fb0c32
Fork 0

Documentation/user-manual.txt: fix a few omissions of gitlink commands.

Signed-off-by: David Kastrup <dak@gnu.org>

David Kastrup committed Aug 8, 2007 at 17:34 UTC 6e30fb0c3241ecdf1ac47c1495bc3b58a0dc6f05
1 file changed +11 -9
Documentation/user-manual.txt
+11 -9
@@ -1796,11 +1796,12 @@ taken from the message containing each patch.
1796 Public git repositories
1797 -----------------------
1798
1799 -Another way to submit changes to a project is to tell the maintainer of
1800 -that project to pull the changes from your repository using git-pull[1].
1801 -In the section "<<getting-updates-with-git-pull, Getting updates with
1802 -git pull>>" we described this as a way to get updates from the "main"
1803 -repository, but it works just as well in the other direction.
1799 +Another way to submit changes to a project is to tell the maintainer
1800 +of that project to pull the changes from your repository using
1801 +gitlink:git-pull[1]. In the section "<<getting-updates-with-git-pull,
1802 +Getting updates with git pull>>" we described this as a way to get
1803 +updates from the "main" repository, but it works just as well in the
1804 +other direction.
1805
1806 If you and the maintainer both have accounts on the same machine, then
1807 you can just pull changes from each other's repositories directly;
@@ -2057,7 +2058,8 @@ $ cd work
2058 Linus's tree will be stored in the remote branch named origin/master,
2059 and can be updated using gitlink:git-fetch[1]; you can track other
2060 public trees using gitlink:git-remote[1] to set up a "remote" and
2060 -git-fetch[1] to keep them up-to-date; see <<repositories-and-branches>>.
2061 +gitlink:git-fetch[1] to keep them up-to-date; see
2062 +<<repositories-and-branches>>.
2063
2064 Now create the branches in which you are going to work; these start out
2065 at the current tip of origin/master branch, and should be set up (using
@@ -2512,9 +2514,9 @@ $ gitk origin..mywork &
2514 And browse through the list of patches in the mywork branch using gitk,
2515 applying them (possibly in a different order) to mywork-new using
2516 cherry-pick, and possibly modifying them as you go using commit --amend.
2515 -The git-gui[1] command may also help as it allows you to individually
2516 -select diff hunks for inclusion in the index (by right-clicking on the
2517 -diff hunk and choosing "Stage Hunk for Commit").
2517 +The gitlink:git-gui[1] command may also help as it allows you to
2518 +individually select diff hunks for inclusion in the index (by
2519 +right-clicking on the diff hunk and choosing "Stage Hunk for Commit").
2520
2521 Another technique is to use git-format-patch to create a series of
2522 patches, then reset the state to before the patches: