Google Git
Sign in
code/git/54bc41416c5d3ecb978acb0df80d57aa3e54494c
commit
54bc41416c5d3ecb978acb0df80d57aa3e54494c
[log]
author
Junio C Hamano <gitster@pobox.com>
Fri Oct 30 13:07:08 2015 -0700
committer
Junio C Hamano <gitster@pobox.com>
Fri Oct 30 13:07:08 2015 -0700
tree
a804b8e346b9f79bc461cdb52686d805ff69d535
parent
f60b5dc68cdb7a75e148c5b98238a880363cf870 [diff]
parent
e34f80278e920e53b69016c7cecb24e4621e4564 [diff]
Merge branch 'jk/merge-file-exit-code'

"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.

* jk/merge-file-exit-code:
  merge-file: clamp exit code to maximum 127
tree: a804b8e346b9f79bc461cdb52686d805ff69d535
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. ewah/
  7. git-gui/
  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/2.7.0.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-slab.h
  61. commit.c
  62. commit.h
  63. config.c
  64. config.mak.in
  65. config.mak.uname
  66. configure.ac
  67. connect.c
  68. connect.h
  69. connected.c
  70. connected.h
  71. convert.c
  72. convert.h
  73. copy.c
  74. COPYING
  75. credential-cache--daemon.c
  76. credential-cache.c
  77. credential-store.c
  78. credential.c
  79. credential.h
  80. csum-file.c
  81. csum-file.h
  82. ctype.c
  83. daemon.c
  84. date.c
  85. decorate.c
  86. decorate.h
  87. delta.h
  88. diff-delta.c
  89. diff-lib.c
  90. diff-no-index.c
  91. diff.c
  92. diff.h
  93. diffcore-break.c
  94. diffcore-delta.c
  95. diffcore-order.c
  96. diffcore-pickaxe.c
  97. diffcore-rename.c
  98. diffcore.h
  99. dir.c
  100. dir.h
  101. editor.c
  102. entry.c
  103. environment.c
  104. exec_cmd.c
  105. exec_cmd.h
  106. fast-import.c
  107. fetch-pack.c
  108. fetch-pack.h
  109. fmt-merge-msg.h
  110. fsck.c
  111. fsck.h
  112. generate-cmdlist.sh
  113. gettext.c
  114. gettext.h
  115. git-add--interactive.perl
  116. git-archimport.perl
  117. git-bisect.sh
  118. git-compat-util.h
  119. git-cvsexportcommit.perl
  120. git-cvsimport.perl
  121. git-cvsserver.perl
  122. git-difftool--helper.sh
  123. git-difftool.perl
  124. git-filter-branch.sh
  125. git-instaweb.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-quiltimport.sh
  134. git-rebase--am.sh
  135. git-rebase--interactive.sh
  136. git-rebase--merge.sh
  137. git-rebase.sh
  138. git-relink.perl
  139. git-remote-testgit.sh
  140. git-request-pull.sh
  141. git-send-email.perl
  142. git-sh-i18n.sh
  143. git-sh-setup.sh
  144. git-stash.sh
  145. git-submodule.sh
  146. git-svn.perl
  147. GIT-VERSION-GEN
  148. git-web--browse.sh
  149. git.c
  150. git.rc
  151. git.spec.in
  152. gpg-interface.c
  153. gpg-interface.h
  154. graph.c
  155. graph.h
  156. grep.c
  157. grep.h
  158. hashmap.c
  159. hashmap.h
  160. help.c
  161. help.h
  162. hex.c
  163. http-backend.c
  164. http-fetch.c
  165. http-push.c
  166. http-walker.c
  167. http.c
  168. http.h
  169. ident.c
  170. imap-send.c
  171. INSTALL
  172. khash.h
  173. kwset.c
  174. kwset.h
  175. levenshtein.c
  176. levenshtein.h
  177. LGPL-2.1
  178. line-log.c
  179. line-log.h
  180. line-range.c
  181. line-range.h
  182. list-objects.c
  183. list-objects.h
  184. ll-merge.c
  185. ll-merge.h
  186. lockfile.c
  187. lockfile.h
  188. log-tree.c
  189. log-tree.h
  190. mailinfo.c
  191. mailinfo.h
  192. mailmap.c
  193. mailmap.h
  194. Makefile
  195. match-trees.c
  196. merge-blobs.c
  197. merge-blobs.h
  198. merge-recursive.c
  199. merge-recursive.h
  200. merge.c
  201. mergesort.c
  202. mergesort.h
  203. name-hash.c
  204. notes-cache.c
  205. notes-cache.h
  206. notes-merge.c
  207. notes-merge.h
  208. notes-utils.c
  209. notes-utils.h
  210. notes.c
  211. notes.h
  212. object.c
  213. object.h
  214. pack-bitmap-write.c
  215. pack-bitmap.c
  216. pack-bitmap.h
  217. pack-check.c
  218. pack-objects.c
  219. pack-objects.h
  220. pack-revindex.c
  221. pack-revindex.h
  222. pack-write.c
  223. pack.h
  224. pager.c
  225. parse-options-cb.c
  226. parse-options.c
  227. parse-options.h
  228. patch-delta.c
  229. patch-ids.c
  230. patch-ids.h
  231. path.c
  232. pathspec.c
  233. pathspec.h
  234. pkt-line.c
  235. pkt-line.h
  236. preload-index.c
  237. pretty.c
  238. prio-queue.c
  239. prio-queue.h
  240. progress.c
  241. progress.h
  242. prompt.c
  243. prompt.h
  244. quote.c
  245. quote.h
  246. reachable.c
  247. reachable.h
  248. read-cache.c
  249. README
  250. ref-filter.c
  251. ref-filter.h
  252. reflog-walk.c
  253. reflog-walk.h
  254. refs.c
  255. refs.h
  256. remote-curl.c
  257. remote-testsvn.c
  258. remote.c
  259. remote.h
  260. replace_object.c
  261. rerere.c
  262. rerere.h
  263. resolve-undo.c
  264. resolve-undo.h
  265. revision.c
  266. revision.h
  267. run-command.c
  268. run-command.h
  269. send-pack.c
  270. send-pack.h
  271. sequencer.c
  272. sequencer.h
  273. server-info.c
  274. setup.c
  275. sh-i18n--envsubst.c
  276. sha1-array.c
  277. sha1-array.h
  278. sha1-lookup.c
  279. sha1-lookup.h
  280. sha1_file.c
  281. sha1_name.c
  282. shallow.c
  283. shell.c
  284. shortlog.h
  285. show-index.c
  286. sideband.c
  287. sideband.h
  288. sigchain.c
  289. sigchain.h
  290. split-index.c
  291. split-index.h
  292. strbuf.c
  293. strbuf.h
  294. streaming.c
  295. streaming.h
  296. string-list.c
  297. string-list.h
  298. submodule-config.c
  299. submodule-config.h
  300. submodule.c
  301. submodule.h
  302. symlinks.c
  303. tag.c
  304. tag.h
  305. tar.h
  306. tempfile.c
  307. tempfile.h
  308. test-chmtime.c
  309. test-config.c
  310. test-ctype.c
  311. test-date.c
  312. test-delta.c
  313. test-dump-cache-tree.c
  314. test-dump-split-index.c
  315. test-dump-untracked-cache.c
  316. test-genrandom.c
  317. test-hashmap.c
  318. test-index-version.c
  319. test-line-buffer.c
  320. test-match-trees.c
  321. test-mergesort.c
  322. test-mktemp.c
  323. test-parse-options.c
  324. test-path-utils.c
  325. test-prio-queue.c
  326. test-read-cache.c
  327. test-regex.c
  328. test-revision-walking.c
  329. test-run-command.c
  330. test-scrap-cache-tree.c
  331. test-sha1-array.c
  332. test-sha1.c
  333. test-sha1.sh
  334. test-sigchain.c
  335. test-string-list.c
  336. test-submodule-config.c
  337. test-subprocess.c
  338. test-svn-fe.c
  339. test-urlmatch-normalization.c
  340. test-wildmatch.c
  341. thread-utils.c
  342. thread-utils.h
  343. trace.c
  344. trace.h
  345. trailer.c
  346. trailer.h
  347. transport-helper.c
  348. transport.c
  349. transport.h
  350. tree-diff.c
  351. tree-walk.c
  352. tree-walk.h
  353. tree.c
  354. tree.h
  355. unicode_width.h
  356. unimplemented.sh
  357. unix-socket.c
  358. unix-socket.h
  359. unpack-trees.c
  360. unpack-trees.h
  361. update_unicode.sh
  362. upload-pack.c
  363. url.c
  364. url.h
  365. urlmatch.c
  366. urlmatch.h
  367. usage.c
  368. userdiff.c
  369. userdiff.h
  370. utf8.c
  371. utf8.h
  372. varint.c
  373. varint.h
  374. version.c
  375. version.h
  376. versioncmp.c
  377. walker.c
  378. walker.h
  379. wildmatch.c
  380. wildmatch.h
  381. worktree.c
  382. worktree.h
  383. wrap-for-bin.sh
  384. wrapper.c
  385. write_or_die.c
  386. ws.c
  387. wt-status.c
  388. wt-status.h
  389. xdiff-interface.c
  390. xdiff-interface.h
  391. zlib.c