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: Alexander Batischev on 10 Jun 2010 20:30 Hi, 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? -- Regards, Alexander Batischev 1024D/69093C81 F870 A381 B5F5 D2A1 1B35 4D63 A1A7 1C77 6909 3C81
From: Joel Roth on 10 Jun 2010 22:40 On Fri, Jun 11, 2010 at 03:25:07AM +0300, Alexander Batischev wrote: > Hi, > > 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> HTH Joel > > -- > Regards, > Alexander Batischev > > 1024D/69093C81 > F870 A381 B5F5 D2A1 1B35 4D63 A1A7 1C77 6909 3C81 -- 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/20100611022150.GA12681(a)sprite
From: Alexander Batischev on 11 Jun 2010 03:00 On Thu, Jun 10, 2010 at 04:21:50PM -1000, Joel Roth wrote: > On Fri, Jun 11, 2010 at 03:25:07AM +0300, Alexander Batischev wrote: > > Hi, > > > > 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> It did exactly what I wanted to! Thank you, Joel! -- Regards, Alexander Batischev 1024D/69093C81 F870 A381 B5F5 D2A1 1B35 4D63 A1A7 1C77 6909 3C81
From: Joel Roth on 11 Jun 2010 05:30 On Fri, Jun 11, 2010 at 09:57:09AM +0300, Alexander Batischev wrote: > On Thu, Jun 10, 2010 at 04:21:50PM -1000, Joel Roth wrote: > > On Fri, Jun 11, 2010 at 03:25:07AM +0300, Alexander Batischev wrote: > > > Hi, > > > > > > 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> > > It did exactly what I wanted to! Thank you, Joel! Good! 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! > -- > Regards, > Alexander Batischev > > 1024D/69093C81 > F870 A381 B5F5 D2A1 1B35 4D63 A1A7 1C77 6909 3C81 -- 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/20100611091658.GA16370(a)sprite
From: Jon Dowland on 11 Jun 2010 09:10
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. -- Jon Dowland -- 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/4C1233BF.3060502(a)debian.org |