You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
docs: use long-form flag names in command documentation
in clap, the visible_aliases, e.g. '[aliases: --after]' are shown at
the very end, which makes it confusing if you're reading from top to
bottom.
aliases are currently omitted entirely from the man pages, making it
confusing to see undocumented aliases being used.
Copy file name to clipboardExpand all lines: cli/tests/[email protected]
+16-14Lines changed: 16 additions & 14 deletions
Original file line number
Diff line number
Diff line change
@@ -1846,8 +1846,8 @@ Note that you can create a merge commit by specifying multiple revisions as argu
1846
1846
* `--no-edit` — Do not edit the newly created change
1847
1847
* `-A`, `--insert-after <REVSETS>` [alias: `after`] — Insert the new change after the given commit(s)
1848
1848
1849
-
Example: `jj new --after A` creates a new change between `A` and its
1850
-
children:
1849
+
Example: `jj new --insert-after A` creates a new change between `A` and
1850
+
its children:
1851
1851
1852
1852
```text
1853
1853
B C
@@ -1857,11 +1857,12 @@ Note that you can create a merge commit by specifying multiple revisions as argu
1857
1857
A A
1858
1858
```
1859
1859
1860
-
Specifying `--after` multiple times will relocate all children of the
1861
-
given commits.
1860
+
Specifying `--insert-after` multiple times will relocate all children of
1861
+
the given commits.
1862
1862
1863
-
Example: `jj new --after A --after X` creates a change with `A` and `X`
1864
-
as parents, and rebases all children on top of the new change:
1863
+
Example: `jj new --insert-after A --insert-after X` creates a change
1864
+
with `A` and `X` as parents, and rebases all children on top of the new
1865
+
change:
1865
1866
1866
1867
```text
1867
1868
B Y
@@ -1872,8 +1873,8 @@ Note that you can create a merge commit by specifying multiple revisions as argu
1872
1873
```
1873
1874
* `-B`, `--insert-before <REVSETS>` [alias: `before`] — Insert the new change before the given commit(s)
1874
1875
1875
-
Example: `jj new --before C` creates a new change between `C` and its
1876
-
parents:
1876
+
Example: `jj new --insert-before C` creates a new change between `C` and
1877
+
its parents:
1877
1878
1878
1879
```text
1879
1880
C
@@ -1883,9 +1884,9 @@ Note that you can create a merge commit by specifying multiple revisions as argu
1883
1884
A B A B
1884
1885
```
1885
1886
1886
-
`--after` and `--before` can be combined.
1887
+
`--insert-after` and `--insert-before` can be combined.
1887
1888
1888
-
Example: `jj new --after A --before D`:
1889
+
Example: `jj new --insert-after A --insert-before D`:
1889
1890
1890
1891
```text
1891
1892
@@ -1898,7 +1899,8 @@ Note that you can create a merge commit by specifying multiple revisions as argu
1898
1899
A A
1899
1900
```
1900
1901
1901
-
Similar to `--after`, you can specify `--before` multiple times.
1902
+
Similar to `--insert-after`, you can specify `--insert-before` multiple
1903
+
times.
1902
1904
1903
1905
1904
1906
@@ -2560,11 +2562,11 @@ Note that conflicts can also be resolved without using this command. You may edi
2560
2562
2561
2563
Restore paths from another revision
2562
2564
2563
-
That means that the paths get the same content in the destination (`--to`) as they had in the source (`--from`). This is typically used for undoing changes to some paths in the working copy (`jj restore <paths>`).
2565
+
That means that the paths get the same content in the destination (`--into`) as they had in the source (`--from`). This is typically used for undoing changes to some paths in the working copy (`jj restore <paths>`).
2564
2566
2565
-
If only one of `--from` or `--to` is specified, the other one defaults to the working copy.
2567
+
If only one of `--from` or `--into` is specified, the other one defaults to the working copy.
2566
2568
2567
-
When neither `--from` nor `--to` is specified, the command restores into the working copy from its parent(s). `jj restore` without arguments is similar to `jj abandon`, except that it leaves an empty revision with its description and other metadata preserved.
2569
+
When neither `--from` nor `--into` is specified, the command restores into the working copy from its parent(s). `jj restore` without arguments is similar to `jj abandon`, except that it leaves an empty revision with its description and other metadata preserved.
2568
2570
2569
2571
See `jj diffedit` if you'd like to restore portions of files rather than entire files.
0 commit comments