[cmake-developers] push of LinkOptionsCommand topic branch

[Matthew Woehlke]

On 2014-02-08 06:10, Stephen Kelly wrote:
> 3) Assuming you still have no local changes,
>
>   git reset --hard origin/LinkOptionsCommand

Worth adding: If you *do* have local changes, you can (before running 
the above) set them aside with "git stash" and (after running the above) 
restore them with "git stash pop". At worst, the forced push will have 
changed things so much that your changes can no longer be applied. If 
this happens, your stash will not be discarded and can be used to see 
your changes in their original context (and will also prevent your 
original version of the branch from being garbage-collected from your 
local clone for as long as the stash exists).

Note also that "reset --hard" will discard any uncommitted changes!

-- 
Matthew