How can I push git-replace to a remote repo? -


i have used "git replace" substitute branch (with no common ancestor) 22b2b25 commit in master. want change permanent. i'm not interested in previous history. in output below top 5 commits original master branch , bottom 2 come different branch.

when pushed new repository git-replace lost , old history reappeared. there way make change permanent?

branch master looks below in original repo. want see in remote repo , subsequent clones.

[mike@localhost canal_site]$ git log --oneline --decorate cdf0ae3 (head, origin/master, master) mm: sqlencode course name ad-hoc courses 2b57df5 mm: fixes changes far 7916eaf mm: ad hoc - more refactoring 1e00d22 mm: reformatted code e36cee1 factored out equal ops 22b2b25 (origin/prod20140313, prod20140313) initial load production 9-june-2015 08379cd initial inclusion of production files 9-june-2015

git replace alone isn't enough: replacing 1 commit isn't enough.

the next commit must reference replaced commit parent.

as mentioned in "removing whole bunch of commits git":

backup repo via git clone.
find out first commit after commits not like , remember hash of direct ancestor (in following bbb).
find first commit before commits not (in following aaa):

git replace bbb aaa

take @ repository (with git log) , check whether should after intended change.
replace command adds meta information .git/refs/replace, git commands interpret correspondingly.
in order make these changes permanent, may use git filter-branch:

git filter-branch -- --all

then need force push (git push --force) in order override remote repo new history of branch. or van push new empty bare repo.


Comments

Post a Comment

Popular posts from this blog

c# - Validate object ID from GET to POST -

i have method allows user access comment have made on site. have post method lets them update comment. my normal solution send entire comment model through, let them update it, update on database when post back. involve sending commentid through in hiddenfor , can manipulated. how can verify commentid sent in get method same i'm getting in post , not able alter comment wish? how can verify commentid sent in method same i'm getting in post? basically have validate following things in post - user logged-in user. authenticated users post comments. commentid in post , should valid commentid , should present in database. userid associated logged-in user should same userid associated comment . comment should contain userid column, can check @ time of update. to make sure update happens comment has been sent in get - hold commentid in session , in post action compare commentid value in session .
Read more

node.js - Custom Model Validator SailsJS -

when using custom model validator checks record within model. return within spread doesn't seem end control flow. //post.js model /** * custom validator **/ types: { isuservalid: function(user_id) { var promise = require('bluebird'); promise.all([ user.findone({id: user_id}) ]) .spread(function(user) { console.log(user); if (user === null || user === undefined) { console.log('failed'); return false; }else{ console.log('passed'); return true; } }); } }, my response standard validation failed response. { "error": "e_validation", "status": 400, "summary": "1 attribute invalid", "model": "post", "invalidattributes": { "owner": [ { "rule": "isuservalid", ...
Read more

php - Find a regex to take part of Email -

i have following emails need extract part from: bestellnummer xxx: 1 von xxx, 1er pack ------------- anfang der nachricht ------------- foo bar baz foo bar baz // <<<<< need text here ------------- ende der nachricht ------------- ------------- anfang der nachricht ------------- foo bar baz foo bar baz ------------- ende der nachricht ------------- there 0 unlimited occurences of ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- and i'm able extract first part regex: $re = "/------------- .*? -------------.?(.*?).?------------- .*? -------------/s"; but, i'm quite new on learning regex, i'm pretty sure there must better regex extract part (foo bar baz foo bar baz) of text between ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- as can in different languages, i'm using .? to match between hyphens. i...
Read more