On Friday 03 May 2013 08:12, Carsten Haitzler wrote : > On Thu, 2 May 2013 15:12:00 +0100 Tom Hacohen <t...@stosb.com> said: > > > git push > > pushes tracking branches to their respective remote branchs on all remotes. > > If you want to push the current branch on top of master you should do: > > git push origin current_branch:master > > Assuming origin is the wanted remote. > > i wasnt expecting to have another invisible branch. i was expecting to push > what > i see now (the code i have not that i did a git commit on). i did have a > conflict while trying to revert 2 commits and gave up by doing a git reset > --hard but that left me in (no branch)... and i didnt realize.
that's why I have this in my $PS1 git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e's/*\(.*\)/(\1)/' } > > > On Thu, May 2, 2013 at 3:00 PM, Carsten Haitzler > > <ras...@rasterman.com>wrote: > > > > > On Thu, 02 May 2013 12:44:00 +0100 Daniel Willmann <d.willm...@samsung.com > > > > > > > said: > > > > > > > On 02/05/13 08:53, Carsten Haitzler (The Rasterman) wrote: > > > > > On Thu, 2 May 2013 16:46:25 +0900 Cedric BAIL <cedric.b...@free.fr> > > > said: > > > > > > > > > >> On Thu, May 2, 2013 at 4:42 PM, Carsten Haitzler < > > > ras...@rasterman.com> > > > > > wrote: > > > > >>> On Thu, 2 May 2013 16:59:39 +1000 David Seikel <onef...@gmail.com> > > > > > said: > > > > >>>> Did you commit it, or did the commit email get lost again? > > > > >>> > > > > >>> i did commit it. :) > > > > >> > > > > >> Not really, git fail ++. > > > > > > > > > > all i have to say about this really: > > > > > > > > > > > > > http://edevel.tumblr.com/post/49425378040/git-transition-is-going-smoothly > > > > > > > > Funny, I thought the transition was long over. > > > > What was your problem? > > > > > > git went and switched branches on me silently and when i pushed it pushed > > > not > > > the branch i was on.. but master elsewhere and thus my git log didnt have > > > the > > > revert but the other branch did ... so i didnt see it... > > > > > > -- > > > ------------- Codito, ergo sum - "I code, therefore I am" -------------- > > > The Rasterman (Carsten Haitzler) ras...@rasterman.com > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET > > > Get 100% visibility into your production application - at no cost. > > > Code-level diagnostics for performance bottlenecks with <2% overhead > > > Download for free and get started troubleshooting in minutes. > > > http://p.sf.net/sfu/appdyn_d2d_ap1 > > > _______________________________________________ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > ------------------------------------------------------------------------------ > > Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET > > Get 100% visibility into your production application - at no cost. > > Code-level diagnostics for performance bottlenecks with <2% overhead > > Download for free and get started troubleshooting in minutes. > > http://p.sf.net/sfu/appdyn_d2d_ap1 > > _______________________________________________ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > -- > ------------- Codito, ergo sum - "I code, therefore I am" -------------- > The Rasterman (Carsten Haitzler) ras...@rasterman.com > > > ------------------------------------------------------------------------------ > Get 100% visibility into Java/.NET code with AppDynamics Lite > It's a free troubleshooting tool designed for production > Get down to code-level detail for bottlenecks, with <2% overhead. > Download for free and get started troubleshooting in minutes. > http://p.sf.net/sfu/appdyn_d2d_ap2 > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Jérémy Zurcher av General Guisan 49 1400 Yverdon-les-bains +41 (0) 79 599 84 27 ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite It's a free troubleshooting tool designed for production Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap2 _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel