[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Pushing patches to staging

From: Phil Holmes
Subject: Re: Pushing patches to staging
Date: Tue, 15 Nov 2011 16:17:30 -0000

----- Original Message ----- From: "David Kastrup" <address@hidden>
To: <address@hidden>
Sent: Tuesday, November 15, 2011 2:43 PM
Subject: Re: Pushing patches to staging

"Phil Holmes" <address@hidden> writes:

----- Original Message ----- From: "Carl Sorensen" <address@hidden>


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

I will get a revised set of commands up either later today or tomorrow.



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.

Thanks, David.  I've seen your earlier mail where you recommend:

"Make sure that you fetch dev/staging.  I find it easiest to fetch all:
have something like the following in .git/config
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = ssh://"

If I'm not doing much in the way of development, do you think it's worth fetching all the remote branches? Is there a way just to fetch staging, and is this sensible?

Phil Holmes

reply via email to

[Prev in Thread] Current Thread [Next in Thread]