Skip to content

Commit 6e30fb0

Browse files
dakhubgitJ. Bruce Fields
authored andcommitted
Documentation/user-manual.txt: fix a few omissions of gitlink commands.
Signed-off-by: David Kastrup <[email protected]>
1 parent 0058a33 commit 6e30fb0

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

Documentation/user-manual.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,11 +1796,12 @@ taken from the message containing each patch.
17961796
Public git repositories
17971797
-----------------------
17981798

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.
18041805

18051806
If you and the maintainer both have accounts on the same machine, then
18061807
you can just pull changes from each other's repositories directly;
@@ -2057,7 +2058,8 @@ $ cd work
20572058
Linus's tree will be stored in the remote branch named origin/master,
20582059
and can be updated using gitlink:git-fetch[1]; you can track other
20592060
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>>.
20612063

20622064
Now create the branches in which you are going to work; these start out
20632065
at the current tip of origin/master branch, and should be set up (using
@@ -2512,9 +2514,9 @@ $ gitk origin..mywork &
25122514
And browse through the list of patches in the mywork branch using gitk,
25132515
applying them (possibly in a different order) to mywork-new using
25142516
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").
25182520

25192521
Another technique is to use git-format-patch to create a series of
25202522
patches, then reset the state to before the patches:

0 commit comments

Comments
 (0)