Removing merge commits in Git -


here, have our commit log repo. can see "merge branch...into..." commits, , after commit, branch merged.

i need delete merge commit, not discard changes. default rebasing doesn't show merge commits.

enter image description here

if want apply changes of commits without including merge commit (which roland smith pointed out considered bad practice) can use git rebase following workflow:

  1. checkout branch want changes on (let's master): git checkout master
  2. reset master commit before merge want undo: git reset --hard <hash of prior commit>. make sure there no uncommitted changes on branch working on or command wipe them out.
  3. checkout branch containing updates want "merge" master without merging (let's call dev): git checkout dev.
  4. rebase dev onto master. put head commit of dev upstream recent commit master points to: git rebase master (see the docs more information).
  5. fix merge conflicts result during rebase (they have happened in normal merge too).
  6. the rebased branch should have of commits following latest commit on master. port on master, check out master (git checkout master) , merge new branch git merge dev. pull changes onto master without adding merge commit.
  7. once you're sure updated master branch looks okay, you'll have update branch on remote repositories too. because you're undoing prior history, when push branch you'll have use --force (or -f) flag remote repo accept changes i.e.: git push origin master --force.

that's there it. after this, commits on dev branched off of master should upstream pre-merge commit above.

note: running rebase permanently update commit history changed branches. safety, recommend taking 1 of 2 methods:

  1. per @dacav's suggestion, keep track of commit hashes each branch before update anything. if things go pear shaped, run git reset --hard <original_commit_hash> put branch on original commit.

  2. make backup copies of both branches before rebase pointing @ original commit:

    git checkout -b master_bk git checkout -b dev_bk


Comments

Post a Comment

Popular posts from this blog

angularjs - ADAL JS Angular- WebAPI add a new role claim to the token -

i have created angular spa webapi backend using adal js authentication.as there no roles in ad, need manually add role claims in order give users access different api controllers. the roles stored in database. expecting inject claim through call webapi after authentication ad. webapi code might this. identity.addclaim(new claim("role", "user")); var ticket = new authenticationticket(identity, props); var accesstoken = startup.oauthbeareroptions.accesstokenformat.protect(ticket); is possible replace adal idtoken new token? is viable solution or there other better way handle this? as initial token generated azuread, possible edit token add new claim? appreciated. graph api supporting group claims. see here: http://justazure.com/azure-active-directory-part-4-group-claims/ if @ examples on page, users assigned groups , app can check group in claims. in current version of portal, need app manifest , modify it.
Read more

node.js - Using Node without global install -

i'm working on few node & electron (atom shell) projects , i'm curious how them work without user having install node globally. i've seen few applications including node directory in project contains node.exe binary. how go setting node project use binary? edit: thought should add, i've searched everywhere answer this, unrelated results.
Read more

php - CakePHP HttpSockets send array of paramms -

i problem when make request (i can request). $link = 'http://uri/path/?param1=1&sid=2&sid=3&sid=4' $http = $httpsocket = new httpsocket(); $res = $httpsocket->get($link); if check request pr($http); i see : [line] => /url/path/?param1=1&sid%5b0%5d=2&sid%5b1%5d=3&sid%5b2%5d=4 http/1.1 and i'm getting empty response because server doesn't know parameters sid%5b0%5d=2 when try send parameters array : $data = array('param1' => '1', 'sid' => array('2','3', '4')); i see same changes %5b0%5d - additional indexes. how fix it? unfortunately , can not change server side, if send request in browser, i'll normal response in json format. when make request, can parameters this: $param1 = $_get['param1']; $sid= $_get['sid']; tip: use diferente names parameters. have multiples sid. use sid1, sid2, sid3... update: can parameters this:...
Read more