From: J. Bruce Fields Date: Mon, 22 Jan 2007 03:02:34 +0000 (-0500) Subject: user-manual: minor quickstart reorganization X-Git-Tag: v1.5.0-rc3~3^2~19 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e4add70cd4ce287c9866f7eec5f1e42245e6f846;p=git.git user-manual: minor quickstart reorganization Move around some stuff in the quickstart, add "push" examples. Signed-off-by: "J. Bruce Fields" --- diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index df0f76241..3f2318115 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 =========================