--- Documentation/gitworkflows.txt | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 3462000..b4b43da 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@ -92,8 +92,8 @@ Topic branches Any nontrivial feature will require several patches to implement, and may get extra bugfixes or improvements during its lifetime. If all -such commits were in one long linear history chain (e.g. if they were -all committed directly to, 'master'), it becomes very hard to see how +such commits were in one long linear history chain (e.g., if they were +all committed directly to 'master'), it becomes very hard to see how they belong together. The key concept here is "topic branches". The name is pretty self @@ -124,8 +124,8 @@ elsewhere should not be rebased. See the section on RECOVERING FROM UPSTREAM REBASE in linkgit:git-rebase[1]. We should point out that "habitually" (regularly for no real reason) -merging a main branch into your topics--and by extension, merging -anything upstream into anything downstream on a regular basis--is +merging a main branch into your topics -- and by extension, merging +anything upstream into anything downstream on a regular basis -- is frowned upon: .Merge to downstream only at well-defined points @@ -207,7 +207,7 @@ There are three main tools that can be used for this: * linkgit:git-fetch[1] that copies remote branches to your repository; and -* linkgit:git-pull[1] that is fetch and merge in one go. +* 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 to merge the remote branch. @@ -258,7 +258,7 @@ follows. Occasionally, the maintainer may get merge conflicts when he tries to pull changes from downstream. In this case, he can ask downstream to do the merge and resolve the conflicts themselves (perhaps they will -know better how to react). It is one of the rare cases where +know better how to resolve them). It is one of the rare cases where downstream 'should' merge from upstream. @@ -274,12 +274,15 @@ maintainer's life easier). .format-patch/am: Publishing branches/topics [caption="Recipe: "] ===================================== -`git format-patch -M upstream..topic` and send out the resulting files. +* `git format-patch -M upstream..topic` to turn them into preformatted + patch files +* `git send-email --to=<recipient> <patches>` ===================================== -See the linkgit:git-format-patch[1] manpage for further usage notes. -Also you should be aware that the maintainer may impose further -restrictions, such as "Signed-off-by" requirements. +See the linkgit:git-format-patch[1] and linkgit:git-send-email[1] +manpages for further usage notes. Also you should be aware that the +maintainer may impose further restrictions, such as "Signed-off-by" +requirements. If the maintainer tells you that your patch no longer applies to the current upstream, you will have to rebase your topic (you cannot use a @@ -319,6 +322,7 @@ linkgit:git-pull[1], linkgit:git-merge[1], linkgit:git-rebase[1], linkgit:git-format-patch[1], +linkgit:git-send-email[1], linkgit:git-am[1] GIT -- 1.6.0.2.408.g3709 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
