git checkout commit and then making it the base

Question

I'm on a branch called A..

the branch A has two commits, with the following codes: commit1 and commit2 where the most recent is commit2.

i just noticed i want to go back to commit1 because in commit2 I deleted a file I needed and i wrote some useless code.. i want to go back to commit1 so i do git checkout commit1

on the terminal it now says i'm here: $ git:(commit1) but what I expected was $ git:(A)

i'm not sure how to make commit1 my base for the the branch.

is it git revert? git reset? I've read the docs but I'm not quite sure what to do

What exactly do you want? Discard commit2 permanently? Apparently according to your comment below. Do you want to insert some changes between commit1 and commit2? — Matthieu Moy, Apr 05 '16 at 09:34

score 0 · Accepted Answer · answered Apr 05 '16 at 09:24

0

If you want to remove your commit2 permanently then do git reset --hard <commit1-id>

This will take to commit1 in branch A.

answered Apr 05 '16 at 09:24

Devanshu Dwivedi

693
2
6
18

is there a way to not delete it so that I can switch back to it after I finished a test for example? – valerio0999 Apr 05 '16 at 09:25
git reset --soft – Devanshu Dwivedi Apr 05 '16 at 09:32

git checkout commit and then making it the base

1 Answers1