Re: git reset respect remote repo (make git idiot proof)

From: Andreas Schwab <schwab@linux-m68k.org>
Date: Oct 3, 2012, 16:52 UTC
Message-ID: <m2bogja46v.fsf@igel.home>
In-Reply-To: <k4hj91$4tt$4@ger.gmane.org>

Geoffrey De Smet <ge0ffrey.spam@gmail.com> writes:

Show 8 quoted lines

> Suppose this case:
>
> git clone .../blessedRepo.git
> // do changes
> git commit -m"bad1"
> // do changes
> git commit -m"bad2"
> git reset --hard HEAD^4 // Why does it let me do this?

Because there is nothing wrong with that.

> // I just "broke" my local repository, because if I continue

No you didn't.

> // do changes
> git commit -m"good1"
> git push origin master // fails because the history disrespects the remote
> repo's history

You may just as well want to push it to a different branch (or even a different repository).

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."