Merge branch 'jc/am-show-current-patch-docfix'

Doc update.

* jc/am-show-current-patch-docfix:
  doc: am --show-current-patch gives an entire e-mail message
This commit is contained in:
Junio C Hamano 2019-11-10 18:02:14 +09:00
commit f1e2666b33

View file

@ -177,7 +177,7 @@ default. You can use `--no-utf8` to override this.
untouched.
--show-current-patch::
Show the patch being applied when "git am" is stopped because
Show the entire e-mail message "git am" has stopped at, because
of conflicts.
DISCUSSION