Re: Pushing patches to staging

[David Kastrup]

"Phil Holmes" <address@hidden> writes:

> ----- Original Message ----- 
> From: "Carl Sorensen" <address@hidden>
>
> [snip]
>
>> No -- your set of commands will *NOT* work.
>
>> No, this set of my commands is not correct, because staging can be reset.
>> So we never want to merge on it, and the git pull commands will do a
>> merge.
>
>> I will get a revised set of commands up either later today or tomorrow.
>
>> Thanks,
>
>> Carl
>
>
> Not having a go at Carl, but I've still not got a simple list of
> commands that will work to push a simple change to staging, and I
> could make 2 patches to push if I had - one to update the bug squad
> and one to speed up doc remakes slightly.

git fetch (to be sure you have the current version of staging)
git checkout origin/staging
... commit your simple change ...
git push origin HEAD:staging

This assumes that you have staging in the branches you fetch.  If that
is not the case, add an appropriate fetch line to the [remote "origin"]
section in your .git/config file.

-- 
David Kastrup