1

Hey I am new to github so please help me out.

I have four commits.

commit4 eh87eg87

commit3 e3e983jj

commit2 de6d6e3d

commit1 du3qw6y1

I want to go back to commit2 and make changes to it and commit it (commit 5) and not lose the rest of the commits like commit4, commit3, commit2 and commit1.

Srinivas
  • 1,780
  • 1
  • 14
  • 27
JS_VIPER
  • 141
  • 1
  • 2
  • 7

3 Answers3

1

You can try two things:

  1. git rebase --interactive <ID of the commit before commit1>. Read the documentation that git prints for you. Basically, you have to use edit instead of pick for commit1, amend your commit, then continue the rebase.
  2. Note down the IDs of the commits, git reset --hard <ID of the commit before commit1>, then take each commit in order and copy them using git cherry-pick <ID of commit>, change the files that you want to change then git commit --ammend, and go to the next one.
Sergiu Dumitriu
  • 11,455
  • 3
  • 39
  • 62
  • Oh, I misread a bit, since you want to fix up `commit2`, you can use `commit1` as the ID of the commit on which to rebase, not the commit before commit1. – Sergiu Dumitriu Dec 22 '12 at 08:21
0

You can just create another branch, which will serve as an identifier for your "dangling" commits, and then reset your current branch to commit 2:

  1. git branch temp_branch (you can choose any name here)
  2. git reset --hard de6d6e3d (the SHA of commit 2)

After creating the temporary branch in step 1, you will still be on your original branch. Once you reset that, you can continue working upon commit 2, and if you need the other two commits, just checkout temp_branch (or use it for rebase, cherry-pick, etc.)

Nevik Rehnel
  • 49,633
  • 6
  • 60
  • 50
0

you might try to 

git revert --no-commit de6d6e3d
... hack ...
git commit -m "re commit2"

if you found the best solution, you might want to add it here: https://git.wiki.kernel.org/index.php/GitSvnClient_(git-svn)

rupert thurner
  • 1