Google Git
Sign in
googlers / jrn / git / f43c97f5720f48598e59629f7dc9892d082d8b0e
commitf43c97f5720f48598e59629f7dc9892d082d8b0e[log] [tgz]
authorNanako Shiraishi <nanako3@lavabit.com>Tue Aug 25 17:20:00 2009 +0900
committerJunio C Hamano <gitster@pobox.com>Wed Aug 26 22:21:33 2009 -0700
treefbafbe95e424f79db599a52f5fb48dfb702dbf52
parent200c75f0d6c83039c201ec6784e4ef3fb95f8fcf [diff]
Documentation: describe the scissors mark support of "git am"

Describe what a scissors mark looks like, and explain in what situation
it is often used.

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