~jan0sch/darcs-book

Showing details for patch fd920f660a5830a2046a748fb5508ebf7d1f00a1.
2020-07-15 (Wed), 4:30 PM - - fd920f660a5830a2046a748fb5508ebf7d1f00a1

mention `not-in-remote` for `obliterate` and `unrecord`

Summary of changes
2 files modified with 8 lines added and 0 lines removed
  • en/04-happy-little-accidents.md with 3 added and 0 removed lines
  • en/08-rewriting-history.md with 5 added and 0 removed lines
diff -rN -u old-darcs-book/en/04-happy-little-accidents.md new-darcs-book/en/04-happy-little-accidents.md
--- old-darcs-book/en/04-happy-little-accidents.md	2024-11-23 12:06:20.152695892 +0000
+++ new-darcs-book/en/04-happy-little-accidents.md	2024-11-23 12:06:20.152695892 +0000
@@ -108,6 +108,9 @@
 can also pass a list of one or more files to `revert` to specify which the files
 for which you would like to `revert` your changes.
 
+To `unrecord` local patches that have not been pushed yet you can use the
+`--not-in-remote` flag.
+
 Unrevert
 --------
 
diff -rN -u old-darcs-book/en/08-rewriting-history.md new-darcs-book/en/08-rewriting-history.md
--- old-darcs-book/en/08-rewriting-history.md	2024-11-23 12:06:20.152695892 +0000
+++ new-darcs-book/en/08-rewriting-history.md	2024-11-23 12:06:20.152695892 +0000
@@ -403,3 +403,8 @@
 interleaved in our first `darcs log` output. But there is no relationship
 between those changes so `darcs` could separate those two cleanly from one
 another.
+
+There is also a way to `obliterate` all patches that are not in a remote
+repository. This is particularly useful if you have applied local patches to
+your repository that clash with remote patches. To remove local-only patches
+just add the `--not-in-remote` flag.