netdev - 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-next>] [day] [month] [year] [list]

Message-ID: <AE90C24D6B3A694183C094C60CF0A2F6026B74A0@saturn3.aculab.com>
Date:	Tue, 17 Dec 2013 17:21:05 -0000
From:	"David Laight" <David.Laight@...LAB.COM>
To:	<netdev@...r.kernel.org>
Subject: git problems

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?

	David

--
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