Google Git
Sign in
code / git / adda3c3beb0a244719becb1895e16227b0393bd1
commitadda3c3beb0a244719becb1895e16227b0393bd1[log] [tgz]
authorMarc Branchaud <marcnarc@xiplink.com>Mon Apr 12 12:28:13 2010 -0400
committerJunio C Hamano <gitster@pobox.com>Mon Apr 12 09:50:09 2010 -0700
tree44b3268ee1379eddabd91fae67c1e71377659fae
parentfcd424011bf7b841e9d4b3154ecadf6bf5e6e686 [diff]
Docs: Add -X option to git-merge's synopsis.

Also move -X's description next to -s's in merge-options.txt.

This makes it easier to learn how to specify merge strategy options.

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