Documentation: Describe merge operation a bit better.

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 351790c4494ec88c01063a4c97c487f9e015c339..9b4088045a5d53ceb1b893e5f6bda575518d36c1 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup || die "Not a git archive."
+. git-sh-setup
 
 usage () {
     echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
@@ -268,7 +268,7 @@ do
     file=`printf '%04d-%stxt' $i "$title"`
     if test '' = "$stdout"
     then
-           echo "* $file"
+           echo "$file"
            process_one >"$outdir$file"
            if test t = "$check"
            then
@@ -279,7 +279,7 @@ do
                :
            fi
     else
-           echo >&2 "* $file"
+           echo >&2 "$file"
            process_one
     fi
     i=`expr "$i" + 1`