Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2008-12-21 | Add a documentat on how to revert a faulty merge | Nanako Shiraishi | 1 | -0/+179 | |
Linus and Junio explained issues that are involved in reverting a merge and how to continue working with a branch that was updated since such a revert on the mailing list. This is to help new people who did not see these messages. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |