Junio C Hamano <gitster@xxxxxxxxx> writes: > Sergey Organov <sorganov@xxxxxxxxx> writes: > >> Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx> >> --- >> Documentation/git-log.txt | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt >> index 9ccba65469d7..f3727c786453 100644 >> --- a/Documentation/git-log.txt >> +++ b/Documentation/git-log.txt >> @@ -145,7 +145,6 @@ combined-diff option or with `--no-diff-merges`). >> rename or copy detection have been requested). >> >> -m:: >> ---diff-merges:: > > Shouldn't this "--diff-merges" be removed from here? Sorry, my eyes. Yes, you are removing it from here. All is well, then.
