X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitworkflows.txt;h=5e4f362ff8073bc5fc5f651f5219834d6173517b;hb=66a1fb30335191b5ebdbcc331832e8903eb3cd0e;hp=065441df644b6efc2883bec87fee4941788312ef;hpb=66276d972c0682d49773c20ca67c33bdab9ab76d;p=git.git diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 065441df6..5e4f362ff 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@ -7,6 +7,7 @@ gitworkflows - An overview of recommended workflows with git SYNOPSIS -------- +[verse] git * @@ -360,7 +361,7 @@ There are three main tools that can be used for this: * linkgit:git-pull[1] that does fetch and merge in one go. -Note the last point. Do 'not' use 'git-pull' unless you actually want +Note the last point. Do 'not' use 'git pull' unless you actually want to merge the remote branch. Getting changes out is easy: @@ -397,7 +398,7 @@ Please pull from ------------------------------------- -In that case, 'git-pull' can do the fetch and merge in one go, as +In that case, 'git pull' can do the fetch and merge in one go, as follows. .Push/pull: Merging remote topics @@ -449,7 +450,7 @@ problem. If you receive such a patch series (as maintainer, or perhaps as a reader of the mailing list it was sent to), save the mails to files, -create a new topic branch and use 'git-am' to import the commits: +create a new topic branch and use 'git am' to import the commits: .format-patch/am: Importing patches [caption="Recipe: "]