Google Git
Sign in
googlers / jrn / git / 57b58db74c3272ac13d5d201ecedf6483b34cdfe
commit57b58db74c3272ac13d5d201ecedf6483b34cdfe[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Fri Nov 04 21:31:28 2011 -0700
committerJunio C Hamano <gitster@pobox.com>Mon Nov 07 14:06:39 2011 -0800
treeb530170fcf23a0ebd9a02e01ffb63c41d0a6b3fe
parent7a2b128d13d880635e7317a9208cfa42a660f143 [diff]
merge: notice local merging of tags and keep it unwrapped

This also updates the autogenerated merge title message from "merge commit X"
to "merge tag X", and its effect can be seen in the changes to the test suite.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 files changed
tree: b530170fcf23a0ebd9a02e01ffb63c41d0a6b3fe
  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.7.8.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. bundle.c
  45. bundle.h
  46. cache-tree.c
  47. cache-tree.h
  48. cache.h
  49. check-builtins.sh
  50. check-racy.c
  51. check_bindir
  52. color.c
  53. color.h
  54. combine-diff.c
  55. command-list.txt
  56. commit.c
  57. commit.h
  58. config.c
  59. config.mak.in
  60. configure.ac
  61. connect.c
  62. connected.c
  63. connected.h
  64. convert.c
  65. convert.h
  66. copy.c
  67. COPYING
  68. csum-file.c
  69. csum-file.h
  70. ctype.c
  71. daemon.c
  72. date.c
  73. decorate.c
  74. decorate.h
  75. delta.h
  76. diff-delta.c
  77. diff-lib.c
  78. diff-no-index.c
  79. diff.c
  80. diff.h
  81. diffcore-break.c
  82. diffcore-delta.c
  83. diffcore-order.c
  84. diffcore-pickaxe.c
  85. diffcore-rename.c
  86. diffcore.h
  87. dir.c
  88. dir.h
  89. editor.c
  90. entry.c
  91. environment.c
  92. exec_cmd.c
  93. exec_cmd.h
  94. fast-import.c
  95. fetch-pack.h
  96. fixup-builtins
  97. fsck.c
  98. fsck.h
  99. generate-cmdlist.sh
  100. gettext.c
  101. gettext.h
  102. git-add--interactive.perl
  103. git-am.sh
  104. git-archimport.perl
  105. git-bisect.sh
  106. git-compat-util.h
  107. git-cvsexportcommit.perl
  108. git-cvsimport.perl
  109. git-cvsserver.perl
  110. git-difftool--helper.sh
  111. git-difftool.perl
  112. git-filter-branch.sh
  113. git-instaweb.sh
  114. git-lost-found.sh
  115. git-merge-octopus.sh
  116. git-merge-one-file.sh
  117. git-merge-resolve.sh
  118. git-mergetool--lib.sh
  119. git-mergetool.sh
  120. git-parse-remote.sh
  121. git-pull.sh
  122. git-quiltimport.sh
  123. git-rebase--am.sh
  124. git-rebase--interactive.sh
  125. git-rebase--merge.sh
  126. git-rebase.sh
  127. git-relink.perl
  128. git-remote-testgit.py
  129. git-repack.sh
  130. git-request-pull.sh
  131. git-send-email.perl
  132. git-sh-i18n.sh
  133. git-sh-setup.sh
  134. git-stash.sh
  135. git-submodule.sh
  136. git-svn.perl
  137. GIT-VERSION-GEN
  138. git-web--browse.sh
  139. git.c
  140. git.spec.in
  141. gpg-interface.c
  142. gpg-interface.h
  143. graph.c
  144. graph.h
  145. grep.c
  146. grep.h
  147. hash.c
  148. hash.h
  149. help.c
  150. help.h
  151. hex.c
  152. http-backend.c
  153. http-fetch.c
  154. http-push.c
  155. http-walker.c
  156. http.c
  157. http.h
  158. ident.c
  159. imap-send.c
  160. INSTALL
  161. kwset.c
  162. kwset.h
  163. levenshtein.c
  164. levenshtein.h
  165. LGPL-2.1
  166. list-objects.c
  167. list-objects.h
  168. ll-merge.c
  169. ll-merge.h
  170. lockfile.c
  171. log-tree.c
  172. log-tree.h
  173. mailmap.c
  174. mailmap.h
  175. Makefile
  176. match-trees.c
  177. merge-file.c
  178. merge-file.h
  179. merge-recursive.c
  180. merge-recursive.h
  181. name-hash.c
  182. notes-cache.c
  183. notes-cache.h
  184. notes-merge.c
  185. notes-merge.h
  186. notes.c
  187. notes.h
  188. object.c
  189. object.h
  190. pack-check.c
  191. pack-refs.c
  192. pack-refs.h
  193. pack-revindex.c
  194. pack-revindex.h
  195. pack-write.c
  196. pack.h
  197. pager.c
  198. parse-options-cb.c
  199. parse-options.c
  200. parse-options.h
  201. patch-delta.c
  202. patch-ids.c
  203. patch-ids.h
  204. path.c
  205. pkt-line.c
  206. pkt-line.h
  207. preload-index.c
  208. pretty.c
  209. progress.c
  210. progress.h
  211. quote.c
  212. quote.h
  213. reachable.c
  214. reachable.h
  215. read-cache.c
  216. README
  217. reflog-walk.c
  218. reflog-walk.h
  219. refs.c
  220. refs.h
  221. remote-curl.c
  222. remote.c
  223. remote.h
  224. replace_object.c
  225. rerere.c
  226. rerere.h
  227. resolve-undo.c
  228. resolve-undo.h
  229. revision.c
  230. revision.h
  231. run-command.c
  232. run-command.h
  233. send-pack.h
  234. sequencer.c
  235. sequencer.h
  236. server-info.c
  237. setup.c
  238. sh-i18n--envsubst.c
  239. sha1-array.c
  240. sha1-array.h
  241. sha1-lookup.c
  242. sha1-lookup.h
  243. sha1_file.c
  244. sha1_name.c
  245. shallow.c
  246. shell.c
  247. shortlog.h
  248. show-index.c
  249. sideband.c
  250. sideband.h
  251. sigchain.c
  252. sigchain.h
  253. strbuf.c
  254. strbuf.h
  255. streaming.c
  256. streaming.h
  257. string-list.c
  258. string-list.h
  259. submodule.c
  260. submodule.h
  261. symlinks.c
  262. tag.c
  263. tag.h
  264. tar.h
  265. test-chmtime.c
  266. test-ctype.c
  267. test-date.c
  268. test-delta.c
  269. test-dump-cache-tree.c
  270. test-genrandom.c
  271. test-index-version.c
  272. test-line-buffer.c
  273. test-match-trees.c
  274. test-mktemp.c
  275. test-obj-pool.c
  276. test-parse-options.c
  277. test-path-utils.c
  278. test-run-command.c
  279. test-sha1.c
  280. test-sha1.sh
  281. test-sigchain.c
  282. test-string-pool.c
  283. test-subprocess.c
  284. test-svn-fe.c
  285. test-treap.c
  286. thread-utils.c
  287. thread-utils.h
  288. trace.c
  289. transport-helper.c
  290. transport.c
  291. transport.h
  292. tree-diff.c
  293. tree-walk.c
  294. tree-walk.h
  295. tree.c
  296. tree.h
  297. unimplemented.sh
  298. unpack-trees.c
  299. unpack-trees.h
  300. upload-pack.c
  301. url.c
  302. url.h
  303. usage.c
  304. userdiff.c
  305. userdiff.h
  306. utf8.c
  307. utf8.h
  308. walker.c
  309. walker.h
  310. wrap-for-bin.sh
  311. wrapper.c
  312. write_or_die.c
  313. ws.c
  314. wt-status.c
  315. wt-status.h
  316. xdiff-interface.c
  317. xdiff-interface.h
  318. zlib.c