Archives
Archives
| From: | Sebastian Pipping <sping@g.o> | ||
|---|---|---|---|
| To: | gentoo-catalyst@l.g.o | ||
| Subject: | Re: [gentoo-catalyst] rfc: merging catalyst git branches | ||
| Date: | Fri, 09 Dec 2011 18:38:39 | ||
| Message-Id: | 4EE25589.40507@gentoo.org | ||
| In Reply to: | Re: [gentoo-catalyst] rfc: merging catalyst git branches by Matt Turner |
||
| 1 | On 12/09/2011 06:37 PM, Matt Turner wrote: |
| 2 | > What Sebastian was suggesting was this, which works (I just verified locally) |
| 3 | > |
| 4 | > git checkout master |
| 5 | > git branch catalyst_3 # creates a branch identical to master called catalyst_3 |
| 6 | > git branch -M catalyst_2 master # renames the catalyst_2 branch to master |
| 7 | |
| 8 | No, step three uses git commit-tree and git merge in my approach -- it's |
| 9 | not a rename. |
| 10 | |
| 11 | |
| 12 | |
| 13 | |
| 14 | Sebastian |