Git pull till a particular commit
GitGithubGit Problem Overview
I want to do a git pull but only till a specific commit.
A->B->C->D->E->F (Remote master HEAD)
so suppose my local master HEAD points to B, and I want to pull till E. What should I do ?
This is not pulling a specific commit, this is pulling upto a specific commit.
Git Solutions
Solution 1 - Git
git pull is nothing but git fetch followed by git merge. So what you can do is
git fetch remote example_branch
git merge <commit_hash>
Solution 2 - Git
First, fetch the latest commits from the remote repo. This will not affect your local branch.
git fetch origin
Then checkout the remote tracking branch and do a git log to see the commits
git checkout origin/master
git log
Grab the commit hash of the commit you want to merge up to (or just the first ~5 chars of it) and merge that commit into master
git checkout master
git merge <commit hash>
Solution 3 - Git
You can also pull the latest commit and just undo until the commit you desire:
git pull origin master
git reset --hard HEAD~1
Replace master with your desired branch.
Use git log to see to which commit you would like to revert:
git log
Personally, this has worked for me better.
Basically, what this does is pulls the latest commit, and you manually revert commits one by one. Use git log in order to see commit history.
Good points: Works as advertised. You don't have to use commit hash or pull unneeded branches.
Bad points: You need to revert commits on by one.
WARNING: Commit/stash all your local changes, because with --hard you are going to lose them. Use at your own risk!
Solution 4 - Git
This works for me:
git pull origin <sha>
e.g.
[dbn src]$ git fetch
[dbn src]$ git status
On branch current_feature
Your branch and 'origin/master' have diverged,
and have 2 and 7 different commits each, respectively.
...
[dbn src]$ git log -3 --pretty=oneline origin/master
f4d10ad2a5eda447bea53fed0b421106dbecea66 CASE-ID1: some descriptive msg
28eb00a42e682e32bdc92e5753a4a9c315f62b42 CASE-ID2: I'm so good at writing commit titles
ff39e46b18a66b21bc1eed81a0974e5c7de6a3e5 CASE-ID2: woooooo
[dbn src]$ git pull origin 28eb00a42e682e32bdc92e5753a4a9c315f62b42
[dbn src]$ git status
On branch current_feature
Your branch and 'origin/master' have diverged,
and have 2 and 1 different commits each, respectively.
...
This pulls 28eb00, ff39e4, and everything before, but doesn't pull f4d10ad. It allows the use of pull --rebase, and honors pull settings in your gitconfig. This works because you're basically treating 28eb00 as a branch.
For the version of git that I'm using, this method requires a full commit hash - no abbreviations or aliases are allowed. You could do something like:
[dbn src]$ git pull origin `git rev-parse origin/master^`
Solution 5 - Git
I've found the updated answer from this video, the accepted answer didn't work for me.
First clone the latest repo from git (if haven't) using
git clone <HTTPs link of the project>
(or using SSH) then go to the desire branch using
git checkout <branch name>
.
Use the command
git log
to check the latest commits. Copy the shal of the particular commit. Then use the command
git fetch origin <Copy paste the shal here>
After pressing enter key. Now use the command
git checkout FETCH_HEAD
Now the particular commit will be available to your local. Change anything and push the code using git push origin <branch name> . That's all.
Check the video for reference.
Solution 6 - Git
If you merge a commit into your branch, you should get all the history between.
Observe:
$ git init ./
Initialized empty Git repository in /Users/dfarrell/git/demo/.git/
$ echo 'a' > letter
$ git add letter
$ git commit -m 'Initial Letter'
[master (root-commit) 6e59e76] Initial Letter
1 file changed, 1 insertion(+)
create mode 100644 letter
$ echo 'b' >> letter
$ git add letter && git commit -m 'Adding letter'
[master 7126e6d] Adding letter
1 file changed, 1 insertion(+)
$ echo 'c' >> letter; git add letter && git commit -m 'Adding letter'
[master f2458be] Adding letter
1 file changed, 1 insertion(+)
$ echo 'd' >> letter; git add letter && git commit -m 'Adding letter'
[master 7f77979] Adding letter
1 file changed, 1 insertion(+)
$ echo 'e' >> letter; git add letter && git commit -m 'Adding letter'
[master 790eade] Adding letter
1 file changed, 1 insertion(+)
$ git log
commit 790eade367b0d8ab8146596cd717c25fd895302a
Author: Dan Farrell <[email protected]>
Date: Thu Jul 16 14:21:26 2015 -0500
Adding letter
commit 7f77979efd17f277b4be695c559c1383d2fc2f27
Author: Dan Farrell <[email protected]>
Date: Thu Jul 16 14:21:24 2015 -0500
Adding letter
commit f2458bea7780bf09fe643095dbae95cf97357ccc
Author: Dan Farrell <[email protected]>
Date: Thu Jul 16 14:21:19 2015 -0500
Adding letter
commit 7126e6dcb9c28ac60cb86ae40fb358350d0c5fad
Author: Dan Farrell <[email protected]>
Date: Thu Jul 16 14:20:52 2015 -0500
Adding letter
commit 6e59e7650314112fb80097d7d3803c964b3656f0
Author: Dan Farrell <[email protected]>
Date: Thu Jul 16 14:20:33 2015 -0500
Initial Letter
$ git checkout 6e59e7650314112fb80097d7d3803c964b3656f
$ git checkout 7126e6dcb9c28ac60cb86ae40fb358350d0c5fad
Note: checking out '7126e6dcb9c28ac60cb86ae40fb358350d0c5fad'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at 7126e6d... Adding letter
$ git checkout -b B 7126e6dcb9c28ac60cb86ae40fb358350d0c5fad
Switched to a new branch 'B'
$ git pull 790eade367b0d8ab8146596cd717c25fd895302a
fatal: '790eade367b0d8ab8146596cd717c25fd895302a' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
$ git merge 7f77979efd17f277b4be695c559c1383d2fc2f27
Updating 7126e6d..7f77979
Fast-forward
letter | 2 ++
1 file changed, 2 insertions(+)
$ cat letter
a
b
c
d
Solution 7 - Git
If you want to pull the code of a specific commit to a new branch you can use this command:
git checkout -b <new_branch_name> <commit_hash>
Solution 8 - Git
git log to check the difference between local and other branch
git log
git merge cuY2324X
then git merge to specific or particular commit by checking out to other branch in which you want to push code to specific commit and use at least 6 digits of commit
Solution 9 - Git
Simple and straightforward
git pull origin <Commit-hash>