Nanako Shiraishi a128a2cdc3 Add a documentat on how to revert a faulty merge ...

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>

2008-12-21 01:48:07 -08:00

..

maintain-git.txt

…

rebase-from-internal-branch.txt

Update my e-mail address

2008-07-21 12:14:42 -07:00

rebuild-from-update-hook.txt

Update my e-mail address

2008-07-21 12:14:42 -07:00

recover-corrupted-blob-object.txt

…

revert-a-faulty-merge.txt

Add a documentat on how to revert a faulty merge

2008-12-21 01:48:07 -08:00

revert-branch-rebase.txt

Update my e-mail address

2008-07-21 12:14:42 -07:00

separating-topic-branches.txt

Update my e-mail address

2008-07-21 12:14:42 -07:00

setup-git-server-over-http.txt

…

update-hook-example.txt

Update my e-mail address

2008-07-21 12:14:42 -07:00

use-git-daemon.txt

…

using-merge-subtree.txt

…