Google Git
Sign in
code / git / caf1899699b2255111a3db335553e31f3718c1c9
commitcaf1899699b2255111a3db335553e31f3718c1c9[log] [tgz]
authorEric Raible <raible@gmail.com>Tue Jul 08 00:40:56 2008 -0700
committerJunio C Hamano <gitster@pobox.com>Tue Jul 08 13:59:08 2008 -0700
treecb34743507a334a887fcf30f99e373a7abb46654
parent7bedebcaad351108a8f6eab6a031f2be2c06b613 [diff]
Documentation: tweak use case in "git stash save --keep-index"

The documentation suggests using "git stash apply" in the
--keep-index workflow even though doing so will lead to clutter
in the stash.  And given that the changes are about to be
committed anyway "git stash pop" is more sensible.

Additionally the text preceeding the example claims that it
works for "two or more commits", but the example itself is
really tailored for just two.  Expanding it just a little
makes it clear how the procedure generalizes to N commits.

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