Google Git
Sign in
googlers / jrn / git / fb6e4e1f3f048898677f3cf177bfcaf60123bd5c
commitfb6e4e1f3f048898677f3cf177bfcaf60123bd5c[log] [tgz]
authorMike Hommey <mh@glandium.org>Thu Nov 08 08:03:06 2007 +0100
committerJunio C Hamano <gitster@pobox.com>Sun Nov 11 17:04:59 2007 -0800
tree01155796459a196d41c9a755df66aaa31b0df008
parent40e2524da9f9fb2806a66a694b9aee722ea3ef0a [diff]
Do git reset --hard HEAD when using git rebase --skip

When you have a merge conflict and want to bypass the commit causing it,
you don't want to care about the dirty state of the working tree.

Also, don't git reset --hard HEAD in the rebase-skip test, so that the
lack of support for this is detected.

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