How to move Git commit to some branch?
in [Debian]
|
Prev: SOLVED Re: Debian asking for DVD... (FYI)
Next: Re (2): [SOLVED, SUPERFICIALLY] Re (8): xorg-server failing on IBM NetVista with Intel 82815 video
From: Boyd Stephen Smith Jr. on 11 Jun 2010 12:10 On Thursday 10 June 2010 21:21:50 Joel Roth wrote: > On Fri, Jun 11, 2010 at 03:25:07AM +0300, Alexander Batischev wrote: > > I did a commit lately but figured out that it was made in wrong place - I > > was browsing previous commits at the moment, so now my new commit is > > somewhere in the middle of the history. I have its hash and I want to > > move it so it would be 'son' of last commit in the master branch. Which > > command should I use? > > git-checkout master > git-cherry-pick <commit> That's one way, I prefer something like: git checkout <commit> git rebase --onto master 'HEAD^' -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss(a)iguanasuicide.net ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/
From: Alexander Batischev on 11 Jun 2010 13:00 On Fri, Jun 11, 2010 at 11:02:56AM -0500, Boyd Stephen Smith Jr. wrote: > On Thursday 10 June 2010 21:21:50 Joel Roth wrote: > > On Fri, Jun 11, 2010 at 03:25:07AM +0300, Alexander Batischev wrote: > > > I did a commit lately but figured out that it was made in wrong place - I > > > was browsing previous commits at the moment, so now my new commit is > > > somewhere in the middle of the history. I have its hash and I want to > > > move it so it would be 'son' of last commit in the master branch. Which > > > command should I use? > > > > git-checkout master > > git-cherry-pick <commit> > > That's one way, I prefer something like: > git checkout <commit> > git rebase --onto master 'HEAD^' That one looks more clear (for me), yet I already done a job with Joel's command. Thank you for your variant, anyways! -- Regards, Alexander Batischev 1024D/69093C81 F870 A381 B5F5 D2A1 1B35 4D63 A1A7 1C77 6909 3C81
From: Joel Roth on 11 Jun 2010 17:30
On Fri, Jun 11, 2010 at 02:01:51PM +0100, Jon Dowland wrote: > On 11/06/2010 10:16, Joel Roth wrote: > > After spending a couple years with git, I'm having to learn > > svn to maintain Debian packages. I find git to be much more > > powerful and flexible. I'm biased, for sure. :-) I think > > git rulez! > > > I guess you are working as part of a team who already use SVN, then... > many teams and individuals use git for debian package management. In > some cases you could use git-svn(1) and git to manipulate a > team-maintained SVN repository. Thanks for the suggestion! I'm conflicted about this, as git-svn adds wrinkles of its own. Fortunately, my svn needs are still rather simple at the moment. Regards, Joel > -- > Jon Dowland > -- Joel Roth -- To UNSUBSCRIBE, email to debian-user-REQUEST(a)lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmaster(a)lists.debian.org Archive: http://lists.debian.org/20100611212216.GA20750(a)sprite |