On Wed, 4 Dec 2013 09:04:43 +0900 Carsten Haitzler (The Rasterman) <ras...@rasterman.com> wrote:
> On Tue, 3 Dec 2013 22:13:45 +0100 dieter roelants <diete...@bsdusr.net> said: > > > On Tue, 3 Dec 2013 14:35:37 +0900 > > Carsten Haitzler (The Rasterman) <ras...@rasterman.com> wrote: > > > > > > The problem is that you tagged one commit and pushed a rebased commit > > > > *and* the tagged commit (that now isn't on any branch). That's maybe > > > > one reason to force the "--tags" to actually push the tags. You can > > > > always push the commits first and later tag what is already public. > > > > > > > > Btw, you can see these things on your machine more easily by using > > > > tig, gitk or the like. > > > > > > > > Lucas De Marchi > > > > > > i would expect the tag to be applied to the conflict merged commit as it > > > needs to be for it to ever be pushed. there is nothing in the git manpage > > > about tagging specific commit revs, so i can only use it to tag what i > > > currently am committing. > > > > 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 > 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! http://25.media.tumblr.com/tumblr_m57ml3AdnA1rrju89o1_500.jpg > > > > > > > -- > > > ------------- Codito, ergo sum - "I code, therefore I am" -------------- > > > The Rasterman (Carsten Haitzler) ras...@rasterman.com ------------------------------------------------------------------------------ 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
