Web lists-archives.com

Re: How to view diff when doing `git push --force`




On Sat, Mar 11, 2017 at 3:52 PM, KES <kes-kes@xxxxxxxxx> wrote:
> Hi. I have done `git push --force` but I forget to `pull`,
>
> Counting objects: 7, done.
> Delta compression using up to 4 threads.
> Compressing objects: 100% (7/7), done.
> Writing objects: 100% (7/7), 765 bytes | 0 bytes/s, done.
> Total 7 (delta 6), reused 0 (delta 0)
> To xxxgit:cry/cry.git
>  + 48e9058...117ee39 staging -> staging (forced update)
>
> But I can not view diff:
>
> git show 48e9058...117ee39
> fatal: ambiguous argument '48e9058...117ee39': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
>
> May I pull info about changes that was deleted?

At this point, no, but in the future instead of --force use
--force-with-lease=<refname>:<expect> where <expect> is e.g. $(git
rev-parse HEAD).