On Wed, Dec 4, 2013 at 6:02 PM, Carsten Haitzler <ras...@rasterman.com> wrote: > On Wed, 4 Dec 2013 05:39:27 +0100 dieter roelants <diete...@bsdusr.net> said: >> On Wed, 4 Dec 2013 09:04:43 +0900 >> Carsten Haitzler (The Rasterman) <ras...@rasterman.com> wrote: >> > > Yeah, you tag what you've committed, but if you rebase afterwards, your >> > > tag is still on the original commit, not on the rebased one. Normally >> > > the original commit stays in your tree until it gets g/c'd, but if you >> > > tag it, it keeps referenced. >> > >> > sure - but i'd expect teh tag to "move forward" to the "conflict resolved" >> > commit as it is impossible to push without that resolve. either that or >> > break >> >> Ah, you expect git to do the userfriendly thing. You obviously haven't >> used it enough. :) > > make an unfriendly tool - then expect shit to happen. especially when you cant > undo stuff... > >> > the resolve commit out after the tag and shove the tagged commit in before >> > commits that required the rebase to begin with. it just behaves really >> > oddly. i blame cedric for this! >> >> oh i wasn't implying cedric isn't to blame in some way > > you haven't spend enough time around here... he certainly is to blame! :)
Yup, fair. :-) -- Cedric BAIL ------------------------------------------------------------------------------ Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
