![[feed]](/wp-content/feed-icon-14x14.png){kind=icon}
14 October 2008 3:57 PM (git | merge | hackery | history | fabrication)
Sometimes when you develop code outside the "official" repository for some project, it turns out that after a few months of hacking, your code is actually suitable for inclusion in the mainline.
Typically when this is the case, the code is just imported directly, throwing away the historical records of how that code came to be.
This is a travesty. Not only is the future deprived of the past, you as a hacker do not get sufficient recognition of your efforts. (What good are perfect patches if you do not reap their accolades?)
But suffer not: while Git does not support direct merges between unrelated branches, it can be made to comply. Script here: git-merge-unrelated-branch. (Example commit.)
Be not deprived of your just deserts!
14 October 2008 5:24 PM
It seems to support:
60ce752c in git://github.com/uzytkownik/gnome-overlay.git
How the branches may be more unrelated (or I misunderstood something).
14 October 2008 6:14 PM
I thought 'eg pull REPO BRANCH' did this just fine; I've used it a time or two to merge branches with no common history. Are there problems in less simplistic cases that need your script?
14 October 2008 6:15 PM
Um, er, I mean 'git pull REPO BRANCH'. Same thing, though.
14 October 2008 7:28 PM
Well ain't I the fool! Elijah it does appear to work; although I normally use fetch + merge, that seemed to work as well.
I swear that a few months ago when I first tried this, it did not do the right thing, erroring out when I went to merge. I tried all merge strategies, even. May my crufty script rot in obscurity, then.
14 October 2008 9:00 PM
It can support those well actually, just set up a graft and you can fake the history being joined in the past. See Documentation/repository-layout.txt in the git distribution. You can later make it permanent with git-filter-branch.
8 November 2017 6:58 AM
Guys just click and enjoy of free online yahtzee game website which has lots of funny and gorgeous amazing games. Thanks a lot for allow me comment here i am giving a link for online game lover.
13 January 2018 4:17 AM
get free unlimited gems and gold on shadow fight 3 with shadow fight 3 cheats online.
8 May 2019 10:10 AM
Some projects are come to teach you many things like how you can complete them at a low budget. These are our learning material which we have to use it.
30 May 2019 10:18 PM
Well ain't I the fool! Elijah it does appear to work; although I normally use fetch + merge, that seemed to work as well.
30 May 2019 10:20 PM
Buy Viagra online! All tablets dosages available today. Lowest Prices. Cheap pills online. 100% Satisfaction Guaranteed! Licensed and Generic products.
30 May 2019 10:21 PM
Comprar Viagra Genérico En España! All tablets dosages available today. Lowest Prices. Cheap pills online. 100% Satisfaction Guaranteed! Licensed and Generic products.
21 June 2019 5:14 PM
Safety in your hands and you need to secure your self from those things which harm you. You doing good work by providing the tips for it.
25 June 2019 3:03 PM
Looking for the best writing service online but lost in the number of fake reviews and don’t know who to believe? We at ScamFighter publish only genuine reviews on all writing service from the web.
20 August 2019 6:47 PM
you probably did a high-quality job right here and thanks for shearing such a blog.This specific put up is definitely very interesting. It has a surely great peace of facts.
23 August 2019 3:37 PM
A lot of people buy cat feeders which looks not good. And I always recommend them to read reviews first then buy it.
20 September 2019 9:50 AM
Thanks for sharing
20 September 2019 9:50 AM
Thanks for sharing