Pavel Roskin <proski@xxxxxxx> writes: > You can clean up the consequences of the failed merge by running > "git-reset --hard origin/everything" where "origin" is the name of the > remote. A failed merge leaves the head of the tree to be merged in MERGE_HEAD, so you can use "git reset --hard MERGE_HEAD" generically. Andreas. -- Andreas Schwab, SuSE Labs, schwab@xxxxxxx SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
