* git problems
@ 2013-12-17 17:21 David Laight
2013-12-17 20:02 ` Hannes Frederic Sowa
0 siblings, 1 reply; 2+ messages in thread
From: David Laight @ 2013-12-17 17:21 UTC (permalink / raw)
To: netdev
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git problems
2013-12-17 17:21 git problems David Laight
@ 2013-12-17 20:02 ` Hannes Frederic Sowa
0 siblings, 0 replies; 2+ messages in thread
From: Hannes Frederic Sowa @ 2013-12-17 20:02 UTC (permalink / raw)
To: David Laight; +Cc: netdev
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?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-17 20:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-17 17:21 git problems David Laight
2013-12-17 20:02 ` Hannes Frederic Sowa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).