Google Git
Sign in
code / git / 123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8
commit123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Tue Nov 01 19:30:11 2005 -0800
committerJunio C Hamano <junkio@cox.net>Thu Nov 03 14:55:10 2005 -0800
tree94780e95e47f6ca7f89c2a2b1e46671178583ed6
parenta3114b3428595710d4719dd668531210af5993c9 [diff]
Add --no-commit to git-merge/git-pull.

With --no-commit flag, git-pull will perform the merge but pretends as
if the merge needed a hand resolve even if automerge cleanly resolves,
to give the user a chance to add further changes and edit the commit
message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2 files changed
tree: 94780e95e47f6ca7f89c2a2b1e46671178583ed6
  1. arm/
  2. compat/
  3. debian/
  4. Documentation/
  5. mozilla-sha1/
  6. ppc/
  7. t/
  8. templates/
  9. .gitignore
  10. apply.c
  11. blob.c
  12. blob.h
  13. cache.h
  14. cat-file.c
  15. check-ref-format.c
  16. checkout-index.c
  17. clone-pack.c
  18. cmd-rename.sh
  19. commit-tree.c
  20. commit.c
  21. commit.h
  22. config.c
  23. connect.c
  24. convert-objects.c
  25. copy.c
  26. COPYING
  27. count-delta.c
  28. count-delta.h
  29. csum-file.c
  30. csum-file.h
  31. ctype.c
  32. daemon.c
  33. date.c
  34. delta.h
  35. diff-delta.c
  36. diff-files.c
  37. diff-index.c
  38. diff-stages.c
  39. diff-tree.c
  40. diff.c
  41. diff.h
  42. diffcore-break.c
  43. diffcore-order.c
  44. diffcore-pathspec.c
  45. diffcore-pickaxe.c
  46. diffcore-rename.c
  47. diffcore.h
  48. entry.c
  49. environment.c
  50. epoch.c
  51. epoch.h
  52. fetch-pack.c
  53. fetch.c
  54. fetch.h
  55. fsck-objects.c
  56. get-tar-commit-id.c
  57. git-add.sh
  58. git-am.sh
  59. git-applymbox.sh
  60. git-applypatch.sh
  61. git-archimport.perl
  62. git-bisect.sh
  63. git-branch.sh
  64. git-checkout.sh
  65. git-cherry.sh
  66. git-clone.sh
  67. git-commit.sh
  68. git-core.spec.in
  69. git-count-objects.sh
  70. git-cvsimport.perl
  71. git-diff.sh
  72. git-fetch.sh
  73. git-fmt-merge-msg.perl
  74. git-format-patch.sh
  75. git-grep.sh
  76. git-log.sh
  77. git-ls-remote.sh
  78. git-merge-octopus.sh
  79. git-merge-one-file.sh
  80. git-merge-recursive.py
  81. git-merge-resolve.sh
  82. git-merge-stupid.sh
  83. git-merge.sh
  84. git-mv.perl
  85. git-octopus.sh
  86. git-parse-remote.sh
  87. git-prune.sh
  88. git-pull.sh
  89. git-push.sh
  90. git-rebase.sh
  91. git-relink.perl
  92. git-rename.perl
  93. git-repack.sh
  94. git-request-pull.sh
  95. git-reset.sh
  96. git-resolve.sh
  97. git-revert.sh
  98. git-send-email.perl
  99. git-sh-setup.sh
  100. git-shortlog.perl
  101. git-status.sh
  102. git-svnimport.perl
  103. git-tag.sh
  104. git-verify-tag.sh
  105. git-whatchanged.sh
  106. git.sh
  107. gitk
  108. gitMergeCommon.py
  109. hash-object.c
  110. http-fetch.c
  111. ident.c
  112. index-pack.c
  113. index.c
  114. init-db.c
  115. INSTALL
  116. local-fetch.c
  117. ls-files.c
  118. ls-tree.c
  119. mailinfo.c
  120. mailsplit.c
  121. Makefile
  122. merge-base.c
  123. merge-index.c
  124. mktag.c
  125. name-rev.c
  126. object.c
  127. object.h
  128. pack-check.c
  129. pack-objects.c
  130. pack.h
  131. patch-delta.c
  132. patch-id.c
  133. path.c
  134. peek-remote.c
  135. pkt-line.c
  136. pkt-line.h
  137. prune-packed.c
  138. quote.c
  139. quote.h
  140. read-cache.c
  141. read-tree.c
  142. README
  143. receive-pack.c
  144. refs.c
  145. refs.h
  146. rev-list.c
  147. rev-parse.c
  148. rsh.c
  149. rsh.h
  150. run-command.c
  151. run-command.h
  152. send-pack.c
  153. server-info.c
  154. setup.c
  155. sha1_file.c
  156. sha1_name.c
  157. shell.c
  158. show-branch.c
  159. show-index.c
  160. ssh-fetch.c
  161. ssh-pull.c
  162. ssh-push.c
  163. ssh-upload.c
  164. strbuf.c
  165. strbuf.h
  166. stripspace.c
  167. symbolic-ref.c
  168. tag.c
  169. tag.h
  170. tar-tree.c
  171. test-date.c
  172. test-delta.c
  173. tree-diff.c
  174. tree.c
  175. tree.h
  176. unpack-file.c
  177. unpack-objects.c
  178. update-index.c
  179. update-ref.c
  180. update-server-info.c
  181. upload-pack.c
  182. usage.c
  183. var.c
  184. verify-pack.c
  185. write-tree.c