Doc: CG: push to staging with rebase not merge

Doc: CG: push to staging with rebase not merge

Use 'git pull -r' for consistency with other
parts of the CG.

[pwm, 2016-04-12 20:55:48]

Please review, thanks. -Paul

[benko.pal, 2016-04-13 10:19:17]

https://codereview.appspot.com/292370043/diff/1/Documentation/contributor/sou...
File Documentation/contributor/source-code.itexi (right):

https://codereview.appspot.com/292370043/diff/1/Documentation/contributor/sou...
Documentation/contributor/source-code.itexi:2296: on savannah.
or by running
$ gitk
after
$ git fetch
or
$ git pull -r
as suggested later, but then check for origin/master being the same as
origin/staging (actually there's no need for a local master or staging branch).
or simply whether
$ git log origin/master..origin/staging
lists any commit.

https://codereview.appspot.com/292370043/diff/1/Documentation/contributor/sou...
Documentation/contributor/source-code.itexi:2325: git pull -r origin staging
$ git pull -r
suffices if staging is not ahead (and branch_name is based on origin/master)

[pwm, 2016-04-14 01:52:23]

https://codereview.appspot.com/292370043/diff/1/Documentation/contributor/sou...
File Documentation/contributor/source-code.itexi (right):

https://codereview.appspot.com/292370043/diff/1/Documentation/contributor/sou...
Documentation/contributor/source-code.itexi:2296: on savannah.
On 2016/04/13 10:19:17, benko.pal wrote:
> or by running
> $ gitk
> after
> $ git fetch
> or
> $ git pull -r
> as suggested later, but then check for origin/master being the same as
> origin/staging (actually there's no need for a local master or staging
branch).
> or simply whether
> $ git log origin/master..origin/staging
> lists any commit.

Thanks, I'll add a version of this to the next patch set.

https://codereview.appspot.com/292370043/diff/1/Documentation/contributor/sou...
Documentation/contributor/source-code.itexi:2325: git pull -r origin staging
On 2016/04/13 10:19:17, benko.pal wrote:
> $ git pull -r
> suffices if staging is not ahead (and branch_name is based on origin/master)

Yes, although I think it's a good idea to show a way that always works,
regardless of other factors, to keep it simple and foolproof.  Those who know
git well will know the shortcuts.

[pwm, 2016-04-14 02:20:22]

Add Benko Pal's suggestions

[pwm, 2016-04-14 02:27:30]

Fix typo