| commit | a128a2cdc35cdf0eff7eeb1c21b912209f133633 | |
| author | Nanako Shiraishi <nanako3@lavabit.com> | |
| Sat, 20 Dec 2008 11:27:02 +0000 (20 20:27 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Dec 2008 09:48:07 +0000 (21 01:48 -0800) | ||
| tree | c884b734d06721eb6995a26daffbe58652df765f | treesnapshot (tar.gz zip) |
| parent | 753bc911f489748a837ecb5ea4b5216220b24845 | commitdiff |
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>
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>
| Documentation/howto/revert-a-faulty-merge.txt | [new file with mode: 0644] | blob |