summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/user-manual.txt30
1 files changed, 22 insertions, 8 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index df0f76241b..3f23181152 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -187,8 +187,8 @@ $ git pull git://example.com/project.git master
$ git pull . test # equivalent to git merge test
-----------------------------------------------
-Sharing development
--------------------
+Sharing your changes
+--------------------
Importing or exporting patches:
@@ -198,12 +198,6 @@ $ git format-patch origin..HEAD # format a patch for each commit
$ git-am mbox # import patches from the mailbox "mbox"
-----------------------------------------------
-Fetch a branch from a different git repository:
-
------------------------------------------------
-$ git fetch git://example.com/project.git theirbranch:mybranch
------------------------------------------------
-
Fetch a branch in a different git repository, then merge into the
current branch:
@@ -218,6 +212,26 @@ current branch:
$ git pull git://example.com/project.git theirbranch:mybranch
-----------------------------------------------
+After creating commits on a local branch, update the remote
+branch with your commits:
+
+-----------------------------------------------
+$ git push ssh://example.com/project.git mybranch:theirbranch
+-----------------------------------------------
+
+When remote and local branch are both named "test":
+
+-----------------------------------------------
+$ git push ssh://example.com/project.git test
+-----------------------------------------------
+
+Shortcut version for a frequently used remote repository:
+
+-----------------------------------------------
+$ git remote add example ssh://example.com/project.git
+$ git push example test
+-----------------------------------------------
+
Repositories and Branches
=========================