From: Andreas Schwab <schwab@linux-m68k.org>
To: Geoffrey De Smet <ge0ffrey.spam@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git reset respect remote repo (make git idiot proof)
Date: Wed, 03 Oct 2012 18:52:24 +0200 [thread overview]
Message-ID: <m2bogja46v.fsf@igel.home> (raw)
In-Reply-To: <k4hj91$4tt$4@ger.gmane.org> (Geoffrey De Smet's message of "Wed, 03 Oct 2012 16:49:06 +0200")
Geoffrey De Smet <ge0ffrey.spam@gmail.com> writes:
> 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."
next prev parent reply other threads:[~2012-10-03 16:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-03 14:49 git reset respect remote repo (make git idiot proof) Geoffrey De Smet
2012-10-03 14:59 ` Ramkumar Ramachandra
2012-10-03 15:12 ` Geoffrey De Smet
2012-10-03 16:40 ` Phil Hord
2012-10-04 8:59 ` Geoffrey De Smet
2012-10-05 3:11 ` Junio C Hamano
2012-10-05 5:35 ` Dirk Heinrichs
2012-10-03 16:52 ` Andreas Schwab [this message]
2012-10-04 8:56 ` Geoffrey De Smet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2bogja46v.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=ge0ffrey.spam@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).