Documentation / git-fmt-merge-msg.txton commit git-ls-files.txt: clarify what "other files" mean for --other (4d590f0)
   1git-fmt-merge-msg(1)
   2====================
   3
   4NAME
   5----
   6git-fmt-merge-msg - Produce a merge commit message
   7
   8
   9SYNOPSIS
  10--------
  11[verse]
  12'git fmt-merge-msg' [--log | --no-log] <$GIT_DIR/FETCH_HEAD
  13'git fmt-merge-msg' [--log | --no-log] -F <file>
  14
  15DESCRIPTION
  16-----------
  17Takes the list of merged objects on stdin and produces a suitable
  18commit message to be used for the merge commit, usually to be
  19passed as the '<merge-message>' argument of 'git-merge'.
  20
  21This script is intended mostly for internal use by scripts
  22automatically invoking 'git-merge'.
  23
  24OPTIONS
  25-------
  26
  27--log::
  28        In addition to branch names, populate the log message with
  29        one-line descriptions from the actual commits that are being
  30        merged.
  31
  32--no-log::
  33        Do not list one-line descriptions from the actual commits being
  34        merged.
  35
  36--summary::
  37--no-summary::
  38        Synonyms to --log and --no-log; these are deprecated and will be
  39        removed in the future.
  40
  41-F <file>::
  42--file <file>::
  43        Take the list of merged objects from <file> instead of
  44        stdin.
  45
  46CONFIGURATION
  47-------------
  48
  49merge.log::
  50        Whether to include summaries of merged commits in newly
  51        merge commit messages. False by default.
  52
  53merge.summary::
  54        Synonym to `merge.log`; this is deprecated and will be removed in
  55        the future.
  56
  57SEE ALSO
  58--------
  59linkgit:git-merge[1]
  60
  61
  62Author
  63------
  64Written by Junio C Hamano <gitster@pobox.com>
  65
  66Documentation
  67--------------
  68Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
  69
  70GIT
  71---
  72Part of the linkgit:git[1] suite