From: Junio C Hamano Date: Mon, 18 Jun 2018 17:18:42 +0000 (-0700) Subject: Merge branch 'km/doc-workflows-typofix' X-Git-Tag: v2.18.0~20 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a6260826292bc00ea8829c1826b7f2f34444d2f2?ds=inline;hp=-c Merge branch 'km/doc-workflows-typofix' Typofix. * km/doc-workflows-typofix: gitworkflows: fix grammar in 'Merge upwards' rule --- a6260826292bc00ea8829c1826b7f2f34444d2f2 diff --combined Documentation/gitworkflows.txt index 926e044d09,06dcdbf400..ca11c7bdaf --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@@ -40,7 -40,7 +40,7 @@@ beginning. It is always easier to squas to split one big commit into several. Don't be afraid of making too small or imperfect steps along the way. You can always go back later and edit the commits with `git rebase --interactive` before you -publish them. You can use `git stash save --keep-index` to run the +publish them. You can use `git stash push --keep-index` to run the test suite independent of other uncommitted changes; see the EXAMPLES section of linkgit:git-stash[1]. @@@ -107,7 -107,7 +107,7 @@@ the unstable branch into the stable one .Merge upwards [caption="Rule: "] ===================================== - Always commit your fixes to the oldest supported branch that require + Always commit your fixes to the oldest supported branch that requires them. Then (periodically) merge the integration branches upwards into each other. ===================================== @@@ -407,8 -407,8 +407,8 @@@ follows `git pull ` ===================================== -Occasionally, the maintainer may get merge conflicts when he tries to -pull changes from downstream. In this case, he can ask downstream to +Occasionally, the maintainer may get merge conflicts when they try to +pull changes from downstream. In this case, they can ask downstream to do the merge and resolve the conflicts themselves (perhaps they will know better how to resolve them). It is one of the rare cases where downstream 'should' merge from upstream.