netdev - Re: git problems

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20131217200204.GE18396@order.stressinduktion.org>
Date:	Tue, 17 Dec 2013 21:02:04 +0100
From:	Hannes Frederic Sowa <hannes@...essinduktion.org>
To:	David Laight <David.Laight@...LAB.COM>
Cc:	netdev@...r.kernel.org
Subject: Re: git problems

On Tue, Dec 17, 2013 at 05:21:05PM -0000, David Laight wrote:
> git managed to completely trash my tree - no problem I'd saved everything important.
> So I renamed the directory tree and then checked out an entire new tree.
> Now it won't let me commit because it has somewhere remembered a merge f*ckup
> in the old tree.
> Where has it got this info saved, and how do I tell it there is nothing wrong?

git merge --abort maybe?

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html