Google Git
Sign in
googlers / jrn / git / d66424c4ac661c69640765260235452499d80378
commitd66424c4ac661c69640765260235452499d80378[log] [tgz]
authorLars Hjemli <hjemli@gmail.com>Mon Sep 24 00:51:45 2007 +0200
committerJunio C Hamano <gitster@pobox.com>Sun Sep 23 17:14:03 2007 -0700
tree26bfe8765b77b05e2d09653d433ffc6789ee3d4e
parentd08af0ad745869a4fe36bc8df4f9804edfb74eb9 [diff]
git-merge: add --ff and --no-ff options

These new options can be used to control the policy for fast-forward
merges: --ff allows it (this is the default) while --no-ff will create
a merge commit.

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