Google Git
Sign in
code/git/74e42ce122bfcbd2e1a06395b80d6a4b44580148
commit
74e42ce122bfcbd2e1a06395b80d6a4b44580148
[log]
author
Jonathan Nieder <jrnieder@gmail.com>
Sat Jun 12 22:32:51 2010 -0500
committer
Junio C Hamano <gitster@pobox.com>
Sun Jun 13 10:05:02 2010 -0700
tree
c252167a9dc6cf3bbd2442401c0d97b20cc81eb8
parent
0d4dbcd35e89a549055e34daf410e4579571b984 [diff]
add-interactive: Clarify “remaining hunks in the file”

The "a" and "d" commands to ‘add --patch’ (accept/reject rest of file)
interact with "j", "g", and "/" (skip some hunks) in a perhaps
confusing way: after accepting or rejecting all _later_ hunks in the
file, they return to the earlier, skipped hunks and prompt the user
about them again.

This behavior can be very useful in practice.  One can still accept or
reject _all_ undecided hunks in a file by using the "g" command to
move to hunk #1 first.

Reported-by: Frédéric Brière <fbriere@fbriere.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 files changed
tree: c252167a9dc6cf3bbd2442401c0d97b20cc81eb8
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. perl/
  11. ppc/
  12. t/
  13. templates/
  14. xdiff/
  15. RelNotes ⇨ Documentation/RelNotes-1.7.1.txt
  16. .gitattributes
  17. .gitignore
  18. .mailmap
  19. abspath.c
  20. advice.c
  21. advice.h
  22. alias.c
  23. alloc.c
  24. archive-tar.c
  25. archive-zip.c
  26. archive.c
  27. archive.h
  28. attr.c
  29. attr.h
  30. base85.c
  31. bisect.c
  32. bisect.h
  33. blob.c
  34. blob.h
  35. branch.c
  36. branch.h
  37. builtin.h
  38. bundle.c
  39. bundle.h
  40. cache-tree.c
  41. cache-tree.h
  42. cache.h
  43. check-builtins.sh
  44. check-racy.c
  45. check_bindir
  46. color.c
  47. color.h
  48. combine-diff.c
  49. command-list.txt
  50. commit.c
  51. commit.h
  52. config.c
  53. config.mak.in
  54. configure.ac
  55. connect.c
  56. convert.c
  57. copy.c
  58. COPYING
  59. csum-file.c
  60. csum-file.h
  61. ctype.c
  62. daemon.c
  63. date.c
  64. decorate.c
  65. decorate.h
  66. delta.h
  67. diff-delta.c
  68. diff-lib.c
  69. diff-no-index.c
  70. diff.c
  71. diff.h
  72. diffcore-break.c
  73. diffcore-delta.c
  74. diffcore-order.c
  75. diffcore-pickaxe.c
  76. diffcore-rename.c
  77. diffcore.h
  78. dir.c
  79. dir.h
  80. editor.c
  81. entry.c
  82. environment.c
  83. exec_cmd.c
  84. exec_cmd.h
  85. fast-import.c
  86. fetch-pack.h
  87. fixup-builtins
  88. fsck.c
  89. fsck.h
  90. generate-cmdlist.sh
  91. git-add--interactive.perl
  92. git-am.sh
  93. git-archimport.perl
  94. git-bisect.sh
  95. git-compat-util.h
  96. git-cvsexportcommit.perl
  97. git-cvsimport.perl
  98. git-cvsserver.perl
  99. git-difftool--helper.sh
  100. git-difftool.perl
  101. git-filter-branch.sh
  102. git-instaweb.sh
  103. git-lost-found.sh
  104. git-merge-octopus.sh
  105. git-merge-one-file.sh
  106. git-merge-resolve.sh
  107. git-mergetool--lib.sh
  108. git-mergetool.sh
  109. git-parse-remote.sh
  110. git-pull.sh
  111. git-quiltimport.sh
  112. git-rebase--interactive.sh
  113. git-rebase.sh
  114. git-relink.perl
  115. git-repack.sh
  116. git-request-pull.sh
  117. git-send-email.perl
  118. git-sh-setup.sh
  119. git-stash.sh
  120. git-submodule.sh
  121. git-svn.perl
  122. GIT-VERSION-GEN
  123. git-web--browse.sh
  124. git.c
  125. git.spec.in
  126. graph.c
  127. graph.h
  128. grep.c
  129. grep.h
  130. hash.c
  131. hash.h
  132. help.c
  133. help.h
  134. hex.c
  135. http-backend.c
  136. http-fetch.c
  137. http-push.c
  138. http-walker.c
  139. http.c
  140. http.h
  141. ident.c
  142. imap-send.c
  143. INSTALL
  144. levenshtein.c
  145. levenshtein.h
  146. list-objects.c
  147. list-objects.h
  148. ll-merge.c
  149. ll-merge.h
  150. lockfile.c
  151. log-tree.c
  152. log-tree.h
  153. mailmap.c
  154. mailmap.h
  155. Makefile
  156. match-trees.c
  157. merge-file.c
  158. merge-recursive.c
  159. merge-recursive.h
  160. name-hash.c
  161. notes.c
  162. notes.h
  163. object.c
  164. object.h
  165. pack-check.c
  166. pack-refs.c
  167. pack-refs.h
  168. pack-revindex.c
  169. pack-revindex.h
  170. pack-write.c
  171. pack.h
  172. pager.c
  173. parse-options.c
  174. parse-options.h
  175. patch-delta.c
  176. patch-ids.c
  177. patch-ids.h
  178. path.c
  179. pkt-line.c
  180. pkt-line.h
  181. preload-index.c
  182. pretty.c
  183. progress.c
  184. progress.h
  185. quote.c
  186. quote.h
  187. reachable.c
  188. reachable.h
  189. read-cache.c
  190. README
  191. reflog-walk.c
  192. reflog-walk.h
  193. refs.c
  194. refs.h
  195. remote-curl.c
  196. remote.c
  197. remote.h
  198. replace_object.c
  199. rerere.c
  200. rerere.h
  201. resolve-undo.c
  202. resolve-undo.h
  203. revision.c
  204. revision.h
  205. run-command.c
  206. run-command.h
  207. send-pack.h
  208. server-info.c
  209. setup.c
  210. sha1-lookup.c
  211. sha1-lookup.h
  212. sha1_file.c
  213. sha1_name.c
  214. shallow.c
  215. shell.c
  216. shortlog.h
  217. show-index.c
  218. sideband.c
  219. sideband.h
  220. sigchain.c
  221. sigchain.h
  222. strbuf.c
  223. strbuf.h
  224. string-list.c
  225. string-list.h
  226. submodule.c
  227. submodule.h
  228. symlinks.c
  229. tag.c
  230. tag.h
  231. tar.h
  232. test-chmtime.c
  233. test-ctype.c
  234. test-date.c
  235. test-delta.c
  236. test-dump-cache-tree.c
  237. test-genrandom.c
  238. test-index-version.c
  239. test-match-trees.c
  240. test-parse-options.c
  241. test-path-utils.c
  242. test-run-command.c
  243. test-sha1.c
  244. test-sha1.sh
  245. test-sigchain.c
  246. thread-utils.c
  247. thread-utils.h
  248. trace.c
  249. transport-helper.c
  250. transport.c
  251. transport.h
  252. tree-diff.c
  253. tree-walk.c
  254. tree-walk.h
  255. tree.c
  256. tree.h
  257. unimplemented.sh
  258. unpack-trees.c
  259. unpack-trees.h
  260. upload-pack.c
  261. usage.c
  262. userdiff.c
  263. userdiff.h
  264. utf8.c
  265. utf8.h
  266. walker.c
  267. walker.h
  268. wrap-for-bin.sh
  269. wrapper.c
  270. write_or_die.c
  271. ws.c
  272. wt-status.c
  273. wt-status.h
  274. xdiff-interface.c
  275. xdiff-interface.h