fasadleader.blogg.se - Git create branch and move commits

Why would git rebase discard the 3 commits after the first example? It's because git rebase with no arguments enables the -fork-point option by default, which uses the local reflog to try to be robust against the upstream branch being force-pushed.

(if you prefer you can write - the previously checked out branch - instead of oldbranch). # Discards the 3 most recent commits from oldbranch. # Cherry-picks the extra commits from oldbranch. by using a "bare" git repository), you won't be able to get the 3 commits back after running git reset -keep HEAD~3.Īn alternative that doesn't rely on the reflog is: # newbranch will omit the 3 most recent commits. Warning: the reflog is enabled by default, but if you've manually disabled it (e.g. Since they're no longer referenced by a branch, it does that by using git's reflog: is the commit that HEAD used to refer to 2 operations ago, i.e.

Then it cherry-picks those 3 commits back onto newbranch.

Git cherry-pick First it discards the 3 most recent commits ( -keep is like -hard, but safer, as fails rather than throw away uncommitted changes). Most previous answers are dangerously wrong!Īs the next time you run git rebase (or git pull -rebase) those 3 commits would be silently discarded from newbranch! (see explanation below) Having tosetuprebase always set makes this more likely. WARNING: With Git version 2.0 and later, if you later git rebase the new branch upon the original ( master) branch, you may need an explicit -no-fork-point option during the rebase to avoid losing the carried-over commits.

*1 You will only be "losing" commits from the master branch, but don't worry, you'll have those commits in newbranch! Alternatively, you can instead of HEAD~3, simply provide the hash of the commit (or the reference like origin/master) you want to "revert back to" on the master (/current) branch, e.g: git reset -hard a1b2c3d4 Git checkout newbranch # Go to the new branch that still has the desired commitsīut do make sure how many commits to go back. Git reset -hard HEAD~3 # Move master back by 3 commits (Make sure you know how many commits you need to go back) Git branch newbranch # Create a new branch, saving the desired commits # Note: Any changes not committed will be lost. Unless there are other circumstances involved, this can be easily done by branching and rolling back. If you don't merge your changes first, they will be lost. If you want to move commits to an existing branch you need to merge your changes into the existing branch before executing git reset -hard HEAD~3 (see Moving to an existing branch above). WARNING: This method works because you are creating a new branch with the first command: git branch newbranch. Once complete, you can retrieve the stashed uncommitted edits with git stash pop Moving to a new branch You can store uncommitted edits to your stash before doing this, using git stash. Git reset -hard HEAD~3 # Go back 3 commits. If you want to move your commits to an existing branch, it will look like this: git checkout existingbranch