Re: Pushing patches to staging

[Carl Sorensen]

On 11/12/11 4:59 PM, "Carl Sorensen" <address@hidden> wrote:

>
>On 11/12/11 3:08 PM, "Graham Percival" <address@hidden> wrote:
>
>>
>>
>>The only problem is to develop a series of simple commands to do
>>this task.
>
>Here's my set of simple commands:
>
>git checkout master
>git pull origin master
>git apply my_patch_file_name_goes_here

I forgot one command, that should go right here:

git commit -a


If you use git am, I believe it will do the commit.  But if you use git
apply, you'll need to do the commit.

>git checkout staging
>git pull origin staging
>git cherry-pick master
>git push origin staging

Sorry for the confusion,

Carl