Adam Borowski <kilobyte@???> writes:
> On Thu, Dec 17, 2015 at 08:52:02PM +0000, Rainer Weikusat wrote:
>> Edward Bartolo <edbarx@???> writes:
>> > I have just 'accidentally' damaged netman's git sources. Please, do
>> > NOT use the 17th December 2015 commits until I resolve the problem. I
>> > am trying to integrate Rainer's debian/rules patch but I am failing.
>> >
>> > If someone can delete completely, that is, delete without a trace
>> > today's (17th December 2015) commit/merge, please do so.
>>
>> You can use
>>
>> git revert <commit id>
>>
>> to revert indiviual commits or
>
> You can then "git rebase -i $base_commit" to squash the reverts into a
> single commit if you're making a large rollback.
>
>> git reset --hard <commit id>
>>
>> to reset the state of the tree to what it was after the named commit.
>
> This, and other history rewrites, are a very bad idea for anything that has
> been pushed into a public repository.

According to git-rebase(1),

    The current branch is reset to <upstream>,

    [...]

    This has the exact same effect as git reset --hard <upstream>

<upstream> denoting what was called $base_commit in the message I'm
replying to.