user-manual: minor quickstart reorganization

Move around some stuff in the quickstart, add "push" examples.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index df0f76241bfa42a98baae561106b68c82f32dd35..3f231811523f41cd67d11f7de884e5d572e10f9e 100644 (file)
--- 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
 -----------------------------------------------
 
 $ git pull . test  # equivalent to git merge test
 -----------------------------------------------
 

-Sharing development
--------------------
+Sharing your changes
+--------------------

 
 Importing or exporting patches:
 
 
 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"
 -----------------------------------------------
 
 $ 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:
 
 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
 -----------------------------------------------
 
 $ 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
 =========================
 
 Repositories and Branches
 =========================