Google Git
Sign in
code / git / 3a2ce799811c7df98a1b0cd3541f68227e587483
commit3a2ce799811c7df98a1b0cd3541f68227e587483[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Wed Jan 09 08:27:09 2013 -0800
committerJunio C Hamano <gitster@pobox.com>Wed Jan 09 08:27:09 2013 -0800
treee60572cdbd98de8a4b859fab44679c8d1b84e185
parent7f27ac56a549fff45e85dae48cec713a340b0616 [diff]
parent5ee29aefac94d4ed11fc5101c89697f39057abb5 [diff]
Merge branch 'nd/maint-branch-desc-doc'

Teach various forms of "format-patch" command line to identify what
branch the patches are taken from, so that the branch description
is picked up in more cases.

* nd/maint-branch-desc-doc:
  format-patch: pick up branch description when no ref is specified
  format-patch: pick up correct branch name from symbolic ref
  t4014: a few more tests on cover letter using branch description
  branch: delete branch description if it's empty
  config.txt: a few lines about branch.<name>.description
tree: e60572cdbd98de8a4b859fab44679c8d1b84e185
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. mergetools/
  11. perl/
  12. po/
  13. ppc/
  14. t/
  15. templates/
  16. vcs-svn/
  17. xdiff/
  18. RelNotes ⇨ Documentation/RelNotes/1.8.2.txt
  19. .gitattributes
  20. .gitignore
  21. .mailmap
  22. abspath.c
  23. aclocal.m4
  24. advice.c
  25. advice.h
  26. alias.c
  27. alloc.c
  28. archive-tar.c
  29. archive-zip.c
  30. archive.c
  31. archive.h
  32. argv-array.c
  33. argv-array.h
  34. attr.c
  35. attr.h
  36. base85.c
  37. bisect.c
  38. bisect.h
  39. blob.c
  40. blob.h
  41. branch.c
  42. branch.h
  43. builtin.h
  44. bulk-checkin.c
  45. bulk-checkin.h
  46. bundle.c
  47. bundle.h
  48. cache-tree.c
  49. cache-tree.h
  50. cache.h
  51. check-builtins.sh
  52. check-racy.c
  53. check_bindir
  54. color.c
  55. color.h
  56. column.c
  57. column.h
  58. combine-diff.c
  59. command-list.txt
  60. commit.c
  61. commit.h
  62. config.c
  63. config.mak.in
  64. configure.ac
  65. connect.c
  66. connected.c
  67. connected.h
  68. convert.c
  69. convert.h
  70. copy.c
  71. COPYING
  72. credential-cache--daemon.c
  73. credential-cache.c
  74. credential-store.c
  75. credential.c
  76. credential.h
  77. csum-file.c
  78. csum-file.h
  79. ctype.c
  80. daemon.c
  81. date.c
  82. decorate.c
  83. decorate.h
  84. delta.h
  85. diff-delta.c
  86. diff-lib.c
  87. diff-no-index.c
  88. diff.c
  89. diff.h
  90. diffcore-break.c
  91. diffcore-delta.c
  92. diffcore-order.c
  93. diffcore-pickaxe.c
  94. diffcore-rename.c
  95. diffcore.h
  96. dir.c
  97. dir.h
  98. editor.c
  99. entry.c
  100. environment.c
  101. exec_cmd.c
  102. exec_cmd.h
  103. fast-import.c
  104. fetch-pack.c
  105. fetch-pack.h
  106. fixup-builtins
  107. fmt-merge-msg.h
  108. fsck.c
  109. fsck.h
  110. generate-cmdlist.sh
  111. gettext.c
  112. gettext.h
  113. git-add--interactive.perl
  114. git-am.sh
  115. git-archimport.perl
  116. git-bisect.sh
  117. git-compat-util.h
  118. git-cvsexportcommit.perl
  119. git-cvsimport.perl
  120. git-cvsserver.perl
  121. git-difftool--helper.sh
  122. git-difftool.perl
  123. git-filter-branch.sh
  124. git-instaweb.sh
  125. git-lost-found.sh
  126. git-merge-octopus.sh
  127. git-merge-one-file.sh
  128. git-merge-resolve.sh
  129. git-mergetool--lib.sh
  130. git-mergetool.sh
  131. git-p4.py
  132. git-parse-remote.sh
  133. git-pull.sh
  134. git-quiltimport.sh
  135. git-rebase--am.sh
  136. git-rebase--interactive.sh
  137. git-rebase--merge.sh
  138. git-rebase.sh
  139. git-relink.perl
  140. git-remote-testgit
  141. git-remote-testpy.py
  142. git-repack.sh
  143. git-request-pull.sh
  144. git-send-email.perl
  145. git-sh-i18n.sh
  146. git-sh-setup.sh
  147. git-stash.sh
  148. git-submodule.sh
  149. git-svn.perl
  150. GIT-VERSION-GEN
  151. git-web--browse.sh
  152. git.c
  153. git.spec.in
  154. gpg-interface.c
  155. gpg-interface.h
  156. graph.c
  157. graph.h
  158. grep.c
  159. grep.h
  160. hash.c
  161. hash.h
  162. help.c
  163. help.h
  164. hex.c
  165. http-backend.c
  166. http-fetch.c
  167. http-push.c
  168. http-walker.c
  169. http.c
  170. http.h
  171. ident.c
  172. imap-send.c
  173. INSTALL
  174. kwset.c
  175. kwset.h
  176. levenshtein.c
  177. levenshtein.h
  178. LGPL-2.1
  179. list-objects.c
  180. list-objects.h
  181. ll-merge.c
  182. ll-merge.h
  183. lockfile.c
  184. log-tree.c
  185. log-tree.h
  186. mailmap.c
  187. mailmap.h
  188. Makefile
  189. match-trees.c
  190. merge-file.c
  191. merge-file.h
  192. merge-recursive.c
  193. merge-recursive.h
  194. merge.c
  195. mergesort.c
  196. mergesort.h
  197. name-hash.c
  198. notes-cache.c
  199. notes-cache.h
  200. notes-merge.c
  201. notes-merge.h
  202. notes.c
  203. notes.h
  204. object.c
  205. object.h
  206. pack-check.c
  207. pack-refs.c
  208. pack-refs.h
  209. pack-revindex.c
  210. pack-revindex.h
  211. pack-write.c
  212. pack.h
  213. pager.c
  214. parse-options-cb.c
  215. parse-options.c
  216. parse-options.h
  217. patch-delta.c
  218. patch-ids.c
  219. patch-ids.h
  220. path.c
  221. pkt-line.c
  222. pkt-line.h
  223. preload-index.c
  224. pretty.c
  225. progress.c
  226. progress.h
  227. prompt.c
  228. prompt.h
  229. quote.c
  230. quote.h
  231. reachable.c
  232. reachable.h
  233. read-cache.c
  234. README
  235. reflog-walk.c
  236. reflog-walk.h
  237. refs.c
  238. refs.h
  239. remote-curl.c
  240. remote-testsvn.c
  241. remote.c
  242. remote.h
  243. replace_object.c
  244. rerere.c
  245. rerere.h
  246. resolve-undo.c
  247. resolve-undo.h
  248. revision.c
  249. revision.h
  250. run-command.c
  251. run-command.h
  252. send-pack.c
  253. send-pack.h
  254. sequencer.c
  255. sequencer.h
  256. server-info.c
  257. setup.c
  258. sh-i18n--envsubst.c
  259. sha1-array.c
  260. sha1-array.h
  261. sha1-lookup.c
  262. sha1-lookup.h
  263. sha1_file.c
  264. sha1_name.c
  265. shallow.c
  266. shell.c
  267. shortlog.h
  268. show-index.c
  269. sideband.c
  270. sideband.h
  271. sigchain.c
  272. sigchain.h
  273. strbuf.c
  274. strbuf.h
  275. streaming.c
  276. streaming.h
  277. string-list.c
  278. string-list.h
  279. submodule.c
  280. submodule.h
  281. symlinks.c
  282. tag.c
  283. tag.h
  284. tar.h
  285. test-chmtime.c
  286. test-ctype.c
  287. test-date.c
  288. test-delta.c
  289. test-dump-cache-tree.c
  290. test-genrandom.c
  291. test-index-version.c
  292. test-line-buffer.c
  293. test-match-trees.c
  294. test-mergesort.c
  295. test-mktemp.c
  296. test-parse-options.c
  297. test-path-utils.c
  298. test-regex.c
  299. test-revision-walking.c
  300. test-run-command.c
  301. test-scrap-cache-tree.c
  302. test-sha1.c
  303. test-sha1.sh
  304. test-sigchain.c
  305. test-string-list.c
  306. test-subprocess.c
  307. test-svn-fe.c
  308. thread-utils.c
  309. thread-utils.h
  310. trace.c
  311. transport-helper.c
  312. transport.c
  313. transport.h
  314. tree-diff.c
  315. tree-walk.c
  316. tree-walk.h
  317. tree.c
  318. tree.h
  319. unimplemented.sh
  320. unix-socket.c
  321. unix-socket.h
  322. unpack-trees.c
  323. unpack-trees.h
  324. upload-pack.c
  325. url.c
  326. url.h
  327. usage.c
  328. userdiff.c
  329. userdiff.h
  330. utf8.c
  331. utf8.h
  332. varint.c
  333. varint.h
  334. version.c
  335. version.h
  336. walker.c
  337. walker.h
  338. wrap-for-bin.sh
  339. wrapper.c
  340. write_or_die.c
  341. ws.c
  342. wt-status.c
  343. wt-status.h
  344. xdiff-interface.c
  345. xdiff-interface.h
  346. zlib.c