Re: [Emc-developers] Git Goofs

2011-09-30 Thread Michael Haberler

Am 30.09.2011 um 04:09 schrieb Sebastian Kuzminsky:
 ...

 And if that wasnt enough to make you a little weak in the knees and/or 
 dizzy, check out git rebase --interactive.  It lets you rewrite and 
 clean up local history before pushing to the shared repo...  But that'll 
 be the topic for another email, if anyone wants it.

Yes! and both should go on the Wiki to educate us Git-unwashed masses!

that was very helpful.

-m

--
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers


[Emc-developers] Git Goofs

2011-09-29 Thread andy pugh
What am I doing wrong? I keep pushing trivial merges by accident.

My process is to work in a separate branch, then cherry-pick the
commits into my tracking branch, then push --dry-run and git log to
make sure it looks right, then push.

So, what part of that process is pushing a merge?

-- 
atp
Torque wrenches are for the obedience of fools and the guidance of wise men

--
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers