kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

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

Signed-off-by: David Kastrup <dak@gnu.org>
maint
David Kastrup 18 years ago committed by J. Bruce Fields
parent
0058a33a8e
commit
6e30fb0c32
1 changed files with 11 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      Documentation/user-manual.txt

20
Documentation/user-manual.txt
Unescape View File

@ -1796,11 +1796,12 @@ taken from the message containing each patch.
Public git repositories Public git repositories
----------------------- -----------------------


Another way to submit changes to a project is to tell the maintainer of Another way to submit changes to a project is to tell the maintainer
that project to pull the changes from your repository using git-pull[1]. of that project to pull the changes from your repository using
In the section "<<getting-updates-with-git-pull, Getting updates with gitlink:git-pull[1]. In the section "<<getting-updates-with-git-pull,
git pull>>" we described this as a way to get updates from the "main" Getting updates with git pull>>" we described this as a way to get
repository, but it works just as well in the other direction. 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 If you and the maintainer both have accounts on the same machine, then
you can just pull changes from each other's repositories directly; 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, 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 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 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 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 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, And browse through the list of patches in the mywork branch using gitk,
applying them (possibly in a different order) to mywork-new using applying them (possibly in a different order) to mywork-new using
cherry-pick, and possibly modifying them as you go using commit --amend. 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 The gitlink:git-gui[1] command may also help as it allows you to
select diff hunks for inclusion in the index (by right-clicking on the individually select diff hunks for inclusion in the index (by
diff hunk and choosing "Stage Hunk for Commit"). 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 Another technique is to use git-format-patch to create a series of
patches, then reset the state to before the patches: patches, then reset the state to before the patches:

Write Preview
Loading…
Cancel
Save