Google Git
Sign in
googlers / jrn / git / f5a84c372f8f044899dde91f1a415d2bf963377e
commitf5a84c372f8f044899dde91f1a415d2bf963377e[log] [tgz]
authorSZEDER Gábor <szeder@ira.uka.de>Sun Apr 06 03:23:42 2008 +0200
committerJunio C Hamano <gitster@pobox.com>Sat Apr 12 19:28:18 2008 -0700
tree8817c96e047da6b4c2ca191b4632933c7ad80ea5
parentf43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f [diff]
doc: moved merge.* config variables into separate merge-config.txt

Include the new file from config.txt and git-merge.txt.

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