github - Merge a git repository lacking commits history to a repository that preserved history -


i downloaded source code of c++ project instead of cloning git repository @ git://www.calatk.org/calatk.git

using source code (with no git history), created git repo, worked on code while, , pushed work/branches github @ https://github.com/agirault/calatk

i make pull request merge code original git repository on calatk.git.

i wondering how since don't have track previous commits in repository. repository on calatk.org should not have been updated since then, means last commit same first commit available on github.

assuming don't mind replacing published github repository 1 contains original project's history†, here try:

  1. add upstream repository second remote:

    git remote add upstream <clone-url>

  2. fetch upstream:

    git fetch upstream

    this should generate new branch pointers including upstream/master. upstream/master should not share history existing commits. is, you'll have 2 root commits: 1 upstream project , 1 fork.

  3. rebase work onto upstream commits (assuming have master worry about):

    git checkout master git rebase upstream/master

    at point should have 1 root commit: 1 upstream project. hash old root commit, should no longer root commit, should match shown in upstream project (3cee904).

    you can use git show 3cee904 make sure commit correct.

  4. force push new history github:

    git push --force origin master

  5. submit changes upstream repository according contribution guidelines.

    since it's not on github or bitbucket it's not they'll able accept pull request (that's proprietary feature). should able request push access or use git format-patch, though. upstream maintainers fetch public github repository.

†important note: if you've got collaborators on github project may not best option. modifying shared commits in git discouraged. i'm recommending since sounds github repository personal repository.


Comments

Post a Comment

Popular posts from this blog

javascript - RequestAnimationFrame not working when exiting fullscreen switching space on Safari -

request animation frame stops working when exiting fullscreen clicking on original space's safari window. fine if fullscreen mode canceled escape key or calling cancelfullscreen(). steps reproduce: open https://dl.dropboxusercontent.com/u/769042/prezi/safari-fullscreen.html click "draw raf", kittie appears click "fullscreen", go fullscreen click "draw raf", kittie appears go space original safari was, showing "click exit fullscreen mode", click anywhere, out fullscreen click "draw raf", nothing happens what handling click calling: window.requestanimationframe(draw); which draws on canvas context: function draw() { ctx.drawimage(img, math.random()*500|0, math.random()*400|0, 100, 100); } i checked .hidden , .visibilitystate, updated correctly. tested on osx 10.9.3, safari 7.0.4 (9537.76.4). has workaround/solution other switching old settimeout? this sounds webkit bug 88940 : using reque
Read more

Python ctypes access violation with const pointer arguments -

i have api i'm trying wrap in python (2.7.6 on win7) code using ctypes. here's api: client_dllfunc bool clientapi search_exporttoclipcopy(clienthsearch handle, int channel, lpctstr filename, const time_t& from, const time_t& to, const bool* cameras, int length, bool usepassword, lpctstr password, bool includetextin = false, bool excludeplayer = false); the issue i'm having cameras argument; , i've had issue other const pointer arguments well. here's how i'm wrapping api: def search_exporttoclipcopy(self, hsearch, csearch, filename, tfrom, tto, cameras, length, usepassword, password, includetextin=true, excludeplayer=false): exporttoclipcopy = self.sdkdll.search_exporttoclipcopy exporttoclipcopy.argtypes = [c_int, c_int, c_wchar_p, c_long, c_long, pointer(c_bool), c_int, c_bool, c_wchar_p, c_bool, c_bool] exporttoclipcopy.restype = c_bool exporttoclipcopy(hsearch, csearch, filename, tfrom, tto, cameras, length, usepassword, pass
Read more