FreeTDS Development Group

[Frediano Ziglio <freddy77 AT gmail.com>]

2012/10/4 James K. Lowden <jklowden AT freetds.org>:
> On Wed, 03 Oct 2012 18:05:29 +0000 (GMT)
> "Craig A. Berry" <craigberry AT mac.com> wrote:
>
>> git reset --hard origin/master
>>
>> should do the trick assuming you want to throw away local changes to
>> configure.ac and get into exactly the same state as the remote
>> repository.
>
> Thank you kindly, captain.  This is the nightly tarballer; the local
> changes are a result of munging configure.ac the night before with the
> current mumble git number revision thing.  Absolutely fine to discard
> and replace (and repatch) with the server's version.
>
>        --hard
>            Matches the working tree and index to that of the tree being
>            switched to. Any changes to tracked files in the working
>            tree since <commit> are lost.
>
> I read that before posting.  "the tree being switched to" didn't sound
> like what I wanted.  It's the same old tree, possibly updated a
> little.
>
> Regards,
>
> --jkl

Well, just a "git reset --hard" will do the trick as this does not
change your branch but just discard any changes you made from HEAD.

Frediano