If I have n commits, how can I branch from the n-3 commit?
I can see the hash of every commit.
You can create the branch via a hash:
git branch branchname <sha1-of-commit>
Or by using a symbolic reference:
git branch branchname HEAD~3
To checkout the branch when creating it, use
git checkout -b branchname <sha1-of-commit or HEAD~3>
To do this on github.com:
- Go to your project.
- Click on the "Commits".
- Click on the <> ("Browse the repository at this point in the history") on the commit you want to branch from.
- Click on the "tree: xxxxxx" up in the upper left. Just below the language statistics bar, you'll get the option to "Find or Create Branch" (just type in a new branch name there)
The magic can be done by git reset.
Create a new branch and switch to it (so all of your latest commits are stored here)
git checkout -b your_new_branchSwitch back to your previous working branch (assume it's master)
git checkout masterRemove the latest x commits, keep master clean
git reset --hard HEAD~x # in your case, x = 3
From this moment on, all the latest x commits are only in the new branch, not in your previous working branch (master) any more.
If you are not sure which commit you want to branch from in advance you can check commits out and examine their code (see source, compile, test) by
git checkout <sha1-of-commit>
once you find the commit you want to branch from you can do that from within the commit (i.e. without going back to the master first) just by creating a branch in the usual way:
git checkout -b <branch_name>
git checkout -b <branch-name> <sha1-of-commit>
A quick way to do it on your Github repo would be as followed:
- Find the specific commit from your branch
- Beside the SHA id, click on 'Browse the repo at this point in the history'
- Here you can create a new branch from this commit
You can do it in Stash.
- Click the commit
- On the right top of the screen click "Tag this commit"
- Then you can create the new branch from the tag you just created.
To do this in Eclipse:
- Go to "Git Repository Exploring" Perspective.
- Expand "Tags" and choose the commit from which you want to create branch.
- Right click on the commit and choose "Create Branch".
- Provide a branch name.
It will create a local branch for you. Then whenever you push your changes, your branch will be pushed to the remote server.
A great related question is: How the heck do you figure this out using the --help option of git? Let's try this:
git branch --help
We see this output:
NAME
git-branch - List, create, or delete branches
SYNOPSIS
git branch [--color[=<when>] | --no-color] [-r | -a]
[--list] [-v [--abbrev=<length> | --no-abbrev]]
[--column[=<options>] | --no-column]
[(--merged | --no-merged | --contains) [<commit>]] [--sort=<key>]
[--points-at <object>] [<pattern>...]
git branch [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
git branch (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
git branch --unset-upstream [<branchname>]
git branch (-m | -M) [<oldbranch>] <newbranch>
git branch (-d | -D) [-r] <branchname>...
git branch --edit-description [<branchname>]
Gobbledegook.
Search through the subsequent text for the word "commit". We find this:
<start-point>
The new branch head will point to this commit. It may be given as a branch name, a
commit-id, or a tag. If this option is omitted, the current HEAD will be used instead.
We're getting somewhere!
Now, focus on this line of the gobbledegook:
git branch [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
Condense that to this:
git branch <branchname> [<start-point>]
And done.
I was able to do it like so:
git branch new_branch_name `git log -n 1 --skip 3 --format=%H`
Where you must enter the skip value. 0 is the latest, 1 is the previous, 2 is the commit before that, etc.
Simply run :
git checkout -b branch-name <commit>
For example :
git checkout -b import/january-2019 1d0fa4fa9ea961182114b63976482e634a8067b8
The checkout command with the parameter -b will create a new branch AND it will switch you over to it
This is what I did:
C:\Users\[path]\build>git checkout -b responsivenavigation 8a75b001096536b3216022484af3026aa9c7bb5b
Switched to a new branch 'responsivenavigation'
C:\Users\jaimemontoya\Dropbox\CuponClub\androidapp\build>git branch
master
* responsivenavigation
In this case, 8a75b001096536b3216022484af3026aa9c7bb5b was and old commit belonging to the master branch.
Go to a particular commit of a git repository
Sometimes when working on a git repository you want to go back to a specific commit (revision) to have a snapshot of your project at a specific time. To do that all you need it the SHA-1 hash of the commit which you can easily find checking the log with the command:
git log --abbrev-commit --pretty=oneline
which will give you a compact list of all the commits and the short version of the SHA-1 hash.
Now that you know the hash of the commit you want to go to you can use one of the following 2 commands:
git checkout HASH
or
git reset --hard HASH
checkout
git checkout <commit> <paths>
Tells git to replace the current state of paths with their state in the given commit. Paths can be files or directories.
If no branch is given, git assumes the HEAD commit.
git checkout <path> // restores path from your last commit. It is a 'filesystem-undo'.
If no path is given, git moves HEAD to the given commit (thereby changing the commit you're sitting and working on).
git checkout branch //means switching branches.
reset
git reset <commit> //re-sets the current pointer to the given commit.
If you are on a branch (you should usually be), HEAD and this branch are moved to commit.
If you are in detached HEAD state, git reset does only move HEAD. To reset a branch, first check it out.
If you wanted to know more about the difference between git reset and git checkout I would recommend to read the official git blog.
For Git GUI users you can visualize all the history (if necessary) and then right click on the commit you wish to branch from and enter the branch name.
To do the accepted answer in Visual Studio 2015 & 2017:
Click in alterations (red arrow above)
Click in Actions (red arrow above) and click in View History on the DropDown Menu
And new Tab will open:
And you should right click the previous commit that you want your code to revert to:
Choose to checkout a new branch and voilá!
Below, although not part of OP question, but I do both a lot and this one is a trick step, at least to me: if you want to revert to a previous commit, without checkout a new branch, DO NOT choose revert(!?); you should choose redefine --mixed or --hard:
if you use source tree that is pretty straight forward.
- Right click the commit from where you need to create a new branch
- Click on 'branch'
- Type name of new branch in the dialog appeared and click 'create branch'
来源：https://stackoverflow.com/questions/2816715/branch-from-a-previous-commit-using-git