Signed-off-by: Boyd Stephen Smith Jr <bss@xxxxxxxxxxxxxxxxx> --- On Saturday 2008 December 20 20:36:43 Junio C Hamano wrote: > "Boyd Stephen Smith Jr." <bss@xxxxxxxxxxxxxxxxx> writes: > > + Reverting a merge commit does not completely "undo" the effect of the > > + merge and it may make future merges more difficult. For more details, > > + please read Documentation/howto/revert-a-faulty-merge.txt. > > I think these new lines need to be dedented, and the previous blank line > should be turned into a line with a single '+'. Fixed, I wasn't familiar with asciidoc. > I'd also suggest removing "does not ... merge and it" from the above > sentence to avoid confusing readers, because people who read only the > above and do not read the howto document may get a wrong impression that > the resulting tree may have some changes that came from the merge even > after the revert, which is not the case. > > An alternative is to give a complete but brief explanation. Perhaps like > this: I took the alternative approach. Documentation/git-revert.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index caa0729..daa77a9 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -44,6 +44,13 @@ OPTIONS option specifies the parent number (starting from 1) of the mainline and allows revert to reverse the change relative to the specified parent. ++ +Reverting a merge commit declares to git that you will never want the tree +changes brought in by the merge but never alters the history changes caused by +the merge. The history allows git to remember you rejected the tree changes +and, as a result, later merges will only bring in changes introduced by commits +that are not ancestors of the revert commit. This may or may not be what you +want. See the 'revert-a-faulty-merge' HOWTO for more details. --no-edit:: With this option, 'git-revert' will not start the commit -- 1.5.6 -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss@xxxxxxxxxxxxxxxxx ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
