diff options
| author |  Nanako Shiraishi <nanako3@lavabit.com> | 2008-12-20 20:27:02 +0900 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-12-21 01:48:07 -0800 |
| commit | a128a2cdc35cdf0eff7eeb1c21b912209f133633 (patch) | |
| tree | c884b734d06721eb6995a26daffbe58652df765f /archive-zip.c | |
| parent | Remove the requirement opaquelocktoken uri scheme (diff) | |
| download | tgif-a128a2cdc35cdf0eff7eeb1c21b912209f133633.tar.xz | |
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>
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions