git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v1 01/11] checkout: split part of it to new command 'restore'

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Mar 13, 2019, 09:17 UTC
Message-ID
<nycvar.QRO.7.76.6.1903131014380.41@tvgsbejvaqbjf.bet>
In-Reply-To
<20190308101655.9767-2-pclouds@gmail.com>
Hi Duy,
On Fri, 8 Mar 2019, Nguyễn Thái Ngọc Duy wrote:
Show 16 quoted lines
> diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
> new file mode 100644
> index 0000000000..a667a5ced4
> --- /dev/null
> +++ b/Documentation/git-restore.txt
> @@ -0,0 +1,172 @@
> [...]
> +
> +To restore all files in the current directory
> +
> +------------
> +$ git restore .
> +------------
> +
> +or to restore all working tree files with 'top' pathspec magic (see
> +linkgit::gitglossary[7])
This has an extra colon, breaking the build:
https://dev.azure.com/git/git/_build/results?buildId=386
You need this squashed in:
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index a667a5ced4ec..1faeee50593e 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -144,7 +144,7 @@ $ git restore .
 ------------
 
 or to restore all working tree files with 'top' pathspec magic (see
-linkgit::gitglossary[7])
+linkgit:gitglossary[7])
 
 ------------
 $ git restore :/

Junio, could you please put this as a SQUASH??? on top of
nd/switch-and-restore, to unbreak the CI builds?

Thanks,
Dscho
Previous: Elijah NewrenNext: Nguyễn Thái Ngọc Duy
Message 9 of 97 in “And new command "restore"”
  1. 00/11 And new command "restore"Nguyễn Thái Ngọc Duy, Mar 8, 2019
  2. 01/11 checkout: split part of it to new command 'restore'Nguyễn Thái Ngọc Duy, Mar 8, 2019
  3. Elijah NewrenMar 8, 2019
  4. Duy NguyenMar 9, 2019
  5. Elijah NewrenMar 9, 2019
  6. Duy NguyenApr 9, 2019
  7. Duy NguyenMar 25, 2019
  8. Elijah NewrenMar 25, 2019
  9. Johannes SchindelinMar 13, 2019
  10. 02/11 restore: take tree-ish from --source option insteadNguyễn Thái Ngọc Duy, Mar 8, 2019
  11. Elijah NewrenMar 9, 2019
  12. Eric SunshineMar 10, 2019
  13. 03/11 restore: make pathspec mandatoryNguyễn Thái Ngọc Duy, Mar 8, 2019
  14. Elijah NewrenMar 9, 2019
  15. 04/11 restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy, Mar 8, 2019
  16. Elijah NewrenMar 9, 2019
  17. 05/11 checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy, Mar 8, 2019
  18. 06/11 restore: add --worktree and --indexNguyễn Thái Ngọc Duy, Mar 8, 2019
  19. Elijah NewrenMar 9, 2019
  20. Eric SunshineMar 10, 2019
  21. Duy NguyenMar 13, 2019
  22. Junio C HamanoMar 13, 2019
  23. 07/11 restore: default to --source=HEAD when only --index is specifiedNguyễn Thái Ngọc Duy, Mar 8, 2019
  24. Elijah NewrenMar 9, 2019
  25. 08/11 restore: support --patchNguyễn Thái Ngọc Duy, Mar 8, 2019
  26. Elijah NewrenMar 9, 2019
  27. 09/11 t: add tests for restoreNguyễn Thái Ngọc Duy, Mar 8, 2019
  28. Andrei RybakMar 9, 2019
  29. Johannes SchindelinMar 13, 2019
  30. Duy NguyenMar 13, 2019
  31. Johannes SchindelinMar 13, 2019
  32. Duy NguyenMar 14, 2019
  33. Junio C HamanoMar 14, 2019
  34. Junio C HamanoMar 14, 2019
  35. 10/11 completion: support restoreNguyễn Thái Ngọc Duy, Mar 8, 2019
  36. Elijah NewrenMar 9, 2019
  37. Duy NguyenMar 11, 2019
  38. Duy NguyenMar 11, 2019
  39. Elijah NewrenMar 11, 2019
  40. 11/11 doc: promote "git restore"Nguyễn Thái Ngọc Duy, Mar 8, 2019
  41. Elijah NewrenMar 9, 2019
  42. Randall S. BeckerMar 11, 2019
  43. Duy NguyenMar 11, 2019
  44. Junio C HamanoMar 13, 2019
  45. Duy NguyenApr 11, 2019
  46. Duy NguyenMar 10, 2019
  47. Jacob KellerMar 10, 2019
  48. Elijah NewrenMar 11, 2019
  49. Junio C HamanoMar 13, 2019
  50. Duy NguyenMar 14, 2019
  51. 00/16 Add new command 'restore'Nguyễn Thái Ngọc Duy, Apr 11, 2019
  52. 01/16 checkout: split part of it to new command 'restore'Nguyễn Thái Ngọc Duy, Apr 11, 2019
  53. 02/16 restore: take tree-ish from --source option insteadNguyễn Thái Ngọc Duy, Apr 11, 2019
  54. 03/16 restore: make pathspec mandatoryNguyễn Thái Ngọc Duy, Apr 11, 2019
  55. 04/16 restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy, Apr 11, 2019
  56. 05/16 checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy, Apr 11, 2019
  57. 06/16 restore: add --worktree and --stagedNguyễn Thái Ngọc Duy, Apr 11, 2019
  58. 07/16 restore: reject invalid combinations with --stagedNguyễn Thái Ngọc Duy, Apr 11, 2019
  59. 08/16 restore: default to --source=HEAD when only --staged is specifiedNguyễn Thái Ngọc Duy, Apr 11, 2019
  60. 09/16 restore: replace --force with --ignore-unmergedNguyễn Thái Ngọc Duy, Apr 11, 2019
  61. 10/16 restore: support --patchNguyễn Thái Ngọc Duy, Apr 11, 2019
  62. 11/16 t: add tests for restoreNguyễn Thái Ngọc Duy, Apr 11, 2019
  63. 12/16 completion: support restoreNguyễn Thái Ngọc Duy, Apr 11, 2019
  64. 13/16 user-manual.txt: prefer 'merge --abort' over 'reset --hard'Nguyễn Thái Ngọc Duy, Apr 11, 2019
  65. 14/16 doc: promote "git restore"Nguyễn Thái Ngọc Duy, Apr 11, 2019
  66. 15/16 rm: add --staged as alias for --cachedNguyễn Thái Ngọc Duy, Apr 11, 2019
  67. 16/16 help: move git-diff and git-reset to different groupsNguyễn Thái Ngọc Duy, Apr 11, 2019
  68. Junio C HamanoApr 12, 2019
  69. Duy NguyenApr 13, 2019
  70. Duy NguyenApr 17, 2019
  71. Junio C HamanoApr 18, 2019
  72. Duy NguyenApr 18, 2019
  73. Johannes SchindelinApr 18, 2019
  74. Duy NguyenApr 18, 2019
  75. 00/16 Add new command 'restore'Nguyễn Thái Ngọc Duy, Apr 25, 2019
  76. 01/16 checkout: split part of it to new command 'restore'Nguyễn Thái Ngọc Duy, Apr 25, 2019
  77. 02/16 restore: take tree-ish from --source option insteadNguyễn Thái Ngọc Duy, Apr 25, 2019
  78. 03/16 restore: make pathspec mandatoryNguyễn Thái Ngọc Duy, Apr 25, 2019
  79. 04/16 restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy, Apr 25, 2019
  80. 05/16 checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy, Apr 25, 2019
  81. 06/16 restore: add --worktree and --stagedNguyễn Thái Ngọc Duy, Apr 25, 2019
  82. 07/16 restore: reject invalid combinations with --stagedNguyễn Thái Ngọc Duy, Apr 25, 2019
  83. 08/16 restore: default to --source=HEAD when only --staged is specifiedNguyễn Thái Ngọc Duy, Apr 25, 2019
  84. 09/16 restore: replace --force with --ignore-unmergedNguyễn Thái Ngọc Duy, Apr 25, 2019
  85. 10/16 restore: support --patchNguyễn Thái Ngọc Duy, Apr 25, 2019
  86. 11/16 t: add tests for restoreNguyễn Thái Ngọc Duy, Apr 25, 2019
  87. SZEDER GáborJun 13, 2019
  88. 12/16 completion: support restoreNguyễn Thái Ngọc Duy, Apr 25, 2019
  89. 13/16 user-manual.txt: prefer 'merge --abort' over 'reset --hard'Nguyễn Thái Ngọc Duy, Apr 25, 2019
  90. 14/16 doc: promote "git restore"Nguyễn Thái Ngọc Duy, Apr 25, 2019
  91. 15/16 help: move git-diff and git-reset to different groupsNguyễn Thái Ngọc Duy, Apr 25, 2019
  92. 16/16 Declare both git-switch and git-restore experimentalNguyễn Thái Ngọc Duy, Apr 25, 2019
  93. Emily ShafferMay 7, 2019
  94. Junio C HamanoMay 7, 2019
  95. Duy NguyenMay 7, 2019
  96. Emily ShafferMay 7, 2019
  97. Duy NguyenMay 8, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.