git checkout master git pull origin feature1 feature2 git checkout develop git pull . master (or maybe git rebase ./master) The first command changes your current branch to master. The second command pulls in changes from the remote feature1 and feature2 branches. This is an “octopus” merge because it merges more than 2 branches. You … Read more
You want to rebase to the root commit of your master branch. More specifically, to squash the two commits, you need to run git rebase -i –root and then substitute squash for pick on the second line in the buffer of the editor that pops up: pick 123456 a squash abcdef b I refer you … Read more
You are stuck in the middle of a rebase. If you have merged/solved conflicts for all the paths: use git add . to commit resolved items. use git rebase –continue to complete the process. Or use git rebase –abort to exit the rebase process without any risk.
To escape from corrupted git rebase you can do the following Reset to a known state. You can find out from which commit you started your rebase with git reflog. For example, reflog will give you the following. The rebase starting point is the last rebase (start) or rebase -i (start) if you did an … Read more
Maybe I’m misunderstanding your question, but I think git rebase -i master should do what you want. It will figure out the merge base and rebase the entire branch from that point to the current HEAD so that it appears to have been branched from the current tip of master. Also, if master has not … Read more
The problem here is that git bisect is branch aware. When you tell it that “dependent” is good and “test” is bad, and one of the changes between there is a merge commit, it knows that in order to figure out where the problem was introduced, it’s going to have to look at commits a, … Read more
hg graft allows “cherry-picking,” as you noted in your question. For example, you can run hg graft -D “2085::2093 and not 2091” to copy only some changes from another revision. By comparison, hg rebase (with or without –keep) will grab whatever changeset you specify and all of its decendant changes. Also, rebase allows you to … Read more
You can rebase your branch while detecting renames like so: git rebase –strategy-option=”rename-threshold=10″ master Edit: Since Git 2.8.0, the term ‘rename-threshold’ has been deprecated in favor of ‘find-renames’. At the moment I’m using Git 2.7.4, and so I could only actually verify that the above command worked in my case — you may need to … Read more
Use interactive rebase: git rebase -i master An editor will open and you will have a list of commits like this: pick b8f7c25 Fix 1 pick 273b0bb Fix 2 pick 6aaea1b Fix 3 Just delete the commit you want to skip. It will be omitted while rebasing your branch onto master. P.S. If you cannot … Read more
Disclaimer: I’ve only used “graft points” myself once in a toy repository. But it is an obscure feature which you may not have heard of, and which _may_ be helpful in your situation. You could use “graft points” to fake the ancestry information. See, e.g., What are .git/info/grafts for? or proceed immediately to the git … Read more