Signed-off-by: Boyd Stephen Smith Jr <bss@xxxxxxxxxxxxxxxxx> --- An example addition to the manpage for revert that references Nanako Shiraishi's new documentation. Documentation/git-revert.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index caa0729..ea36bdf 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -45,6 +45,10 @@ OPTIONS the mainline and allows revert to reverse the change relative to the specified parent. + 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. + --no-edit:: With this option, 'git-revert' will not start the commit message editor. -- 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
