rebase: try not to munge commit log message

This makes rebase/am keep the original commit log message
better, even when it does not conform to "single line paragraph
to say what it does, then explain and defend why it is a good
change in later paragraphs" convention.

This change is a two-edged sword.  While the earlier behaviour
would make such commit log messages more friendly to readers who
expect to get the birds-eye view with oneline summary formats,
users who primarily use git as a way to interact with foreign
SCM systems would not care much about the convenience of oneline
git log tools, but care more about preserving their own
convention.  This changes their commits less useful to readers
who read them with git tools while keeping them more consistent
with the foreign SCM systems they interact with.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 files changed
tree: bf55bb8793862418110af379a1aa7cc19ad2d317
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitweb/
  7. mozilla-sha1/
  8. perl/
  9. ppc/
  10. t/
  11. templates/
  12. xdiff/
  13. .gitignore
  14. .mailmap
  15. alloc.c
  16. archive-tar.c
  17. archive-zip.c
  18. archive.h
  19. attr.c
  20. attr.h
  21. base85.c
  22. blob.c
  23. blob.h
  24. builtin-add.c
  25. builtin-annotate.c
  26. builtin-apply.c
  27. builtin-archive.c
  28. builtin-blame.c
  29. builtin-branch.c
  30. builtin-bundle.c
  31. builtin-cat-file.c
  32. builtin-check-attr.c
  33. builtin-check-ref-format.c
  34. builtin-checkout-index.c
  35. builtin-commit-tree.c
  36. builtin-config.c
  37. builtin-count-objects.c
  38. builtin-describe.c
  39. builtin-diff-files.c
  40. builtin-diff-index.c
  41. builtin-diff-tree.c
  42. builtin-diff.c
  43. builtin-fetch--tool.c
  44. builtin-fmt-merge-msg.c
  45. builtin-for-each-ref.c
  46. builtin-fsck.c
  47. builtin-gc.c
  48. builtin-grep.c
  49. builtin-init-db.c
  50. builtin-log.c
  51. builtin-ls-files.c
  52. builtin-ls-tree.c
  53. builtin-mailinfo.c
  54. builtin-mailsplit.c
  55. builtin-merge-base.c
  56. builtin-merge-file.c
  57. builtin-mv.c
  58. builtin-name-rev.c
  59. builtin-pack-objects.c
  60. builtin-pack-refs.c
  61. builtin-prune-packed.c
  62. builtin-prune.c
  63. builtin-push.c
  64. builtin-read-tree.c
  65. builtin-reflog.c
  66. builtin-rerere.c
  67. builtin-rev-list.c
  68. builtin-rev-parse.c
  69. builtin-revert.c
  70. builtin-rm.c
  71. builtin-runstatus.c
  72. builtin-shortlog.c
  73. builtin-show-branch.c
  74. builtin-show-ref.c
  75. builtin-stripspace.c
  76. builtin-symbolic-ref.c
  77. builtin-tar-tree.c
  78. builtin-unpack-objects.c
  79. builtin-update-index.c
  80. builtin-update-ref.c
  81. builtin-upload-archive.c
  82. builtin-verify-pack.c
  83. builtin-write-tree.c
  84. builtin.h
  85. cache-tree.c
  86. cache-tree.h
  87. cache.h
  88. check-builtins.sh
  89. check-racy.c
  90. color.c
  91. color.h
  92. combine-diff.c
  93. commit.c
  94. commit.h
  95. config.c
  96. config.mak.in
  97. configure.ac
  98. connect.c
  99. convert-objects.c
  100. convert.c
  101. copy.c
  102. COPYING
  103. csum-file.c
  104. csum-file.h
  105. ctype.c
  106. daemon.c
  107. date.c
  108. decorate.c
  109. decorate.h
  110. delta.h
  111. diff-delta.c
  112. diff-lib.c
  113. diff.c
  114. diff.h
  115. diffcore-break.c
  116. diffcore-delta.c
  117. diffcore-order.c
  118. diffcore-pickaxe.c
  119. diffcore-rename.c
  120. diffcore.h
  121. dir.c
  122. dir.h
  123. dump-cache-tree.c
  124. entry.c
  125. environment.c
  126. exec_cmd.c
  127. exec_cmd.h
  128. fast-import.c
  129. fetch-pack.c
  130. fetch.c
  131. fetch.h
  132. fixup-builtins
  133. generate-cmdlist.sh
  134. git-add--interactive.perl
  135. git-am.sh
  136. git-archimport.perl
  137. git-bisect.sh
  138. git-checkout.sh
  139. git-clean.sh
  140. git-clone.sh
  141. git-commit.sh
  142. git-compat-util.h
  143. git-cvsexportcommit.perl
  144. git-cvsimport.perl
  145. git-cvsserver.perl
  146. git-fetch.sh
  147. git-filter-branch.sh
  148. git-instaweb.sh
  149. git-lost-found.sh
  150. git-ls-remote.sh
  151. git-merge-octopus.sh
  152. git-merge-one-file.sh
  153. git-merge-ours.sh
  154. git-merge-resolve.sh
  155. git-merge-stupid.sh
  156. git-merge.sh
  157. git-mergetool.sh
  158. git-parse-remote.sh
  159. git-pull.sh
  160. git-quiltimport.sh
  161. git-rebase--interactive.sh
  162. git-rebase.sh
  163. git-relink.perl
  164. git-remote.perl
  165. git-repack.sh
  166. git-request-pull.sh
  167. git-reset.sh
  168. git-send-email.perl
  169. git-sh-setup.sh
  170. git-stash.sh
  171. git-submodule.sh
  172. git-svn.perl
  173. git-svnimport.perl
  174. git-tag.sh
  175. git-verify-tag.sh
  176. GIT-VERSION-GEN
  177. git.c
  178. git.spec.in
  179. gitk
  180. grep.c
  181. grep.h
  182. hash-object.c
  183. help.c
  184. http-fetch.c
  185. http-push.c
  186. http.c
  187. http.h
  188. ident.c
  189. imap-send.c
  190. index-pack.c
  191. INSTALL
  192. interpolate.c
  193. interpolate.h
  194. list-objects.c
  195. list-objects.h
  196. local-fetch.c
  197. lockfile.c
  198. log-tree.c
  199. log-tree.h
  200. mailmap.c
  201. mailmap.h
  202. Makefile
  203. match-trees.c
  204. merge-file.c
  205. merge-index.c
  206. merge-recursive.c
  207. merge-tree.c
  208. mktag.c
  209. mktree.c
  210. object-refs.c
  211. object.c
  212. object.h
  213. pack-check.c
  214. pack-redundant.c
  215. pack-write.c
  216. pack.h
  217. pager.c
  218. patch-delta.c
  219. patch-id.c
  220. patch-ids.c
  221. patch-ids.h
  222. path-list.c
  223. path-list.h
  224. path.c
  225. peek-remote.c
  226. pkt-line.c
  227. pkt-line.h
  228. progress.c
  229. progress.h
  230. quote.c
  231. quote.h
  232. reachable.c
  233. reachable.h
  234. read-cache.c
  235. README
  236. receive-pack.c
  237. reflog-walk.c
  238. reflog-walk.h
  239. refs.c
  240. refs.h
  241. remote.c
  242. remote.h
  243. revision.c
  244. revision.h
  245. rsh.c
  246. rsh.h
  247. run-command.c
  248. run-command.h
  249. send-pack.c
  250. server-info.c
  251. setup.c
  252. sha1_file.c
  253. sha1_name.c
  254. shallow.c
  255. shell.c
  256. show-index.c
  257. sideband.c
  258. sideband.h
  259. ssh-fetch.c
  260. ssh-pull.c
  261. ssh-push.c
  262. ssh-upload.c
  263. strbuf.c
  264. strbuf.h
  265. symlinks.c
  266. tag.c
  267. tag.h
  268. tar.h
  269. test-chmtime.c
  270. test-date.c
  271. test-delta.c
  272. test-genrandom.c
  273. test-match-trees.c
  274. test-sha1.c
  275. test-sha1.sh
  276. trace.c
  277. tree-diff.c
  278. tree-walk.c
  279. tree-walk.h
  280. tree.c
  281. tree.h
  282. unpack-file.c
  283. unpack-trees.c
  284. unpack-trees.h
  285. update-server-info.c
  286. upload-pack.c
  287. usage.c
  288. utf8.c
  289. utf8.h
  290. var.c
  291. write_or_die.c
  292. wt-status.c
  293. wt-status.h
  294. xdiff-interface.c
  295. xdiff-interface.h