ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/docs/tutorial.md

412 lines
17 KiB
Markdown
Raw Normal View History

docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
# Tutorial
This text assumes that the reader is familiar with Git.
docs: move initial configuration from tutorial to README It seems better to have all the one-time setup in the README.
2021-10-14 03:33:17 +00:00
## Preparation
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
docs: move initial configuration from tutorial to README It seems better to have all the one-time setup in the README.
2021-10-14 03:33:17 +00:00
If you haven't already, make sure you
docs: Move installation instructions from README to docs/ This allows the tutorial to reference them and will make it easier to have different instructions for different versions. We can later restore some instructions to the README, but I think this is important since the installation instructions do change in important (even if slight) ways from time to time.
2023-08-13 07:31:20 +00:00
[install and configure Jujutsu](install-and-setup.md).
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
## Cloning a Git repo
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Let's start by cloning GitHub's Hello-World repo using `jj`:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
# Note the "git" before "clone" (there is no support for cloning native jj
# repos yet)
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
$ jj git clone https://github.com/octocat/Hello-World
Fetching into new repo in "/tmp/tmp.O1DWMiaKd4/Hello-World"
Working copy now at: d7439b06fbef (no description set)
Added 1 files, modified 0 files, removed 0 files
$ cd Hello-World
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
Running `jj st` (short for`jj status`) now yields something like this:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
$ jj st
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Parent commit: 7fd1a60b01f9 Merge pull request #6 from Spaceghost/patch-1
Working copy : d7439b06fbef (no description set)
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
The working copy is clean
```
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
We can see from the output above that our working copy is a real commit with a
Seems like it's referring to the wrong commit?
2023-03-21 09:35:04 +00:00
commit ID (`d7439b06fbef` in the example). When you make a change in the working
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
copy, the working-copy commit gets automatically amended by the next `jj`
command.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
## Creating our first change
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Now let's say we want to edit the `README` file in the repo to say "Goodbye"
instead of "Hello". Let's start by describing the change (adding a
commit message) so we don't forget what we're working on:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
configs: use Notepad as default editor on Windows
2023-08-10 15:50:25 +00:00
# This will bring up $EDITOR (or `pico` or `Notepad` by default). Enter
# something like "Say goodbye" in the editor and then save the file and close
# the editor.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
$ jj describe
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: e427edcfd0ba Say goodbye
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
Now make the change in the README:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
# Adjust as necessary for compatibility with your flavor of `sed`
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
$ sed -i 's/Hello/Goodbye/' README
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
$ jj st
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Parent commit: 7fd1a60b01f9 Merge pull request #6 from Spaceghost/patch-1
Working copy : 5d39e19dac36 Say goodbye
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
Working copy changes:
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
M README
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
Note that you didn't have to tell Jujutsu to add the change like you would with
`git add`. You actually don't even need to tell it when you add new files or
docs: update tutorial to mention `jj untrack` I forgot to update the tutorial when I closed #14.
2021-12-01 17:51:40 +00:00
remove existing files. To untrack a path, add it to your `.gitignore` and run
`jj untrack <path>`.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
To see the diff, run `jj diff`:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
docs: use Git-style unified diff in the tutorial The default (color-based) diffs are not readable in Markdown. Also, it's useful for the user to learn about the `--git` flag.
2021-10-13 15:31:46 +00:00
$ jj diff --git # Feel free to skip the `--git` flag
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
diff --git a/README b/README
index 980a0d5f19...1ce3f81130 100644
--- a/README
+++ b/README
@@ -1,1 +1,1 @@
-Hello World!
+Goodbye World!
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
docs: use Git-style unified diff in the tutorial The default (color-based) diffs are not readable in Markdown. Also, it's useful for the user to learn about the `--git` flag.
2021-10-13 15:31:46 +00:00
Jujutsu's diff format currently defaults to inline coloring of the diff (like
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
`git diff --color-words`), so we used `--git` above to make the diff readable in
tutorial: mention `jj edit` and when it's useful I made some other little touchups while at it. Closes #840
2022-12-10 00:55:56 +00:00
this tutorial.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
docs: hyphenate "working-copy" when used as a compound modifier
2022-08-25 23:34:18 +00:00
As you may have noticed, the working-copy commit's ID changed both when we
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
edited the description and when we edited the README. However, the parent commit
docs: hyphenate "working-copy" when used as a compound modifier
2022-08-25 23:34:18 +00:00
stayed the same. Each change to the working-copy commit amends the previous
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
version. So how do we tell Jujutsu that we are done amending the current change
and want to start working on a new one? That is what `jj new` is for. That will
create a new commit on top of your current working-copy commit. The new commit
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
is for the working-copy changes. For familiarity for user coming from other
VCSs, there is also a `jj checkout/co` command, which is practically a synonym
for `jj new` (you can specify a destination for `jj new` as well).
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
So, let's say we're now done with this change, so we create a new change:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj new
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: aef4df99ea11 (no description set)
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
$ jj st
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Parent commit: 5d39e19dac36 Say goodbye
Working copy : aef4df99ea11 (no description set)
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
The working copy is clean
```
If we later realize that we want to make further changes, we can make them
in the working copy and then run `jj squash`. That command squashes the changes
from a given commit into its parent commit. Like most commands, it acts on the
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
working-copy commit by default. When run on the working-copy commit, it behaves
very similar to `git commit --amend`, and `jj amend` is in fact an alias for
`jj squash`.
Alternatively, we can use `jj edit <commit>` to resume editing a commit in the
working copy. Any further changes in the working copy will then amend the
commit. Whether you choose to checkout-and-squash or to edit typically depends
on how done you are with the change; if the change is almost done, it makes
sense to use `jj checkout` so you can easily review your adjustments with
`jj diff` before running `jj squash`.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
tutorial: delete obsolete mention of aliases The heading says it's going to explain aliases, but it doesn't, and now that we've documented aliases in config.md, we probably don't need to mention it in the tutorial.
2023-01-26 23:02:19 +00:00
## The log command and "revsets"
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
You're probably familiar with `git log`. Jujutsu has very similar functionality
cli: make `log` show only local commits by default The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.
2022-05-14 15:55:46 +00:00
in its `jj log` command:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
cli: make `log` show only local commits by default The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.
2022-05-14 15:55:46 +00:00
$ jj log
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ mpqrykypylvy martinvonz@google.com 2023-02-12 15:00:22.000 -08:00 aef4df99ea11
│ (empty) (no description set)
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ kntqzsqtnspv martinvonz@google.com 2023-02-12 14:56:59.000 -08:00 5d39e19dac36
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ Say goodbye
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ orrkosyozysx octocat@nowhere.com 2012-03-06 15:06:50.000 -08:00 master 7fd1a60b01f9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ (empty) Merge pull request #6 from Spaceghost/patch-1
~
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
The `@` indicates the working-copy commit. The first ID on a line
(e.g. "mpqrykypylvy" above) is the "change ID", which is an ID that follows the
commit as it's rewritten (similar to Gerrit's Change-Id). The second ID is the
commit ID, which changes when you rewrite the commit. You can give either ID
to commands that take revisions as arguments. We will generally prefer change
IDs because they stay the same when the commit is rewritten.
cli: make `log` show only local commits by default The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.
2022-05-14 15:55:46 +00:00
tutorial: mention `jj edit` and when it's useful I made some other little touchups while at it. Closes #840
2022-12-10 00:55:56 +00:00
By default, `jj log` lists your local commits, with some remote commits added
for context. The `~` indicates that the commit has parents that are not
included in the graph. We can use the `-r` flag to select a different set of
revisions to list. The flag accepts a ["revset"](revsets.md), which is an
expression in a simple language for specifying revisions. For example, `@`
refers to the working-copy commit, `root` refers to the root commit,
`branches()` refers to all commits pointed to by branches. We can combine
expressions with `|` for union, `&` for intersection and `~` for difference. For
example:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
$ jj log -r '@ | root | branches()'
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ mpqrykypylvy martinvonz@google.com 2023-02-12 15:00:22.000 -08:00 aef4df99ea11
╷ (empty) (no description set)
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
╷ ◉ kowxouwzwxmv octocat@nowhere.com 2014-06-10 15:22:26.000 -07:00 test b3cbd5bbd7e8
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
╭─╯ Create CONTRIBUTING.md
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ tpstlustrvsn support+octocat@github.com 2018-05-10 12:55:19.000 -05:00 octocat-patch-1 b1b3f9723831
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ sentence case
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ orrkosyozysx octocat@nowhere.com 2012-03-06 15:06:50.000 -08:00 master 7fd1a60b01f9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
╷ (empty) Merge pull request #6 from Spaceghost/patch-1
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ zzzzzzzzzzzz 1970-01-01 00:00:00.000 +00:00 000000000000
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
(empty) (no description set)
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
The `000000000000` commit (change ID `zzzzzzzzzzzz`) is a virtual commit that's
called the "root commit". It's the root commit of every repo. The `root` symbol
in the revset matches it.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
revsets: swap meaning of operators `~` and `-` (#46) As suggested by @arxanas, this makes `-` symmetric with `+` and `-` is easier to type than `~`.
2021-12-13 06:40:16 +00:00
There are also operators for getting the parents (`foo-`), children (`foo+`),
docs: revert to using revset operator `:` instead of `::` Since our latest release doesn't support `::`, we shouldn't tell the user to use it. This commit should be backed out once we've released jj 0.9.0.
2023-08-01 21:30:52 +00:00
ancestors (`:foo`), descendants (`foo:`), DAG range (`foo:bar`, like
revsets: change Git-like range operator `,,,` operator to `..` (#46)
2021-12-12 07:56:37 +00:00
`git log --ancestry-path`), range (`foo..bar`, same as Git's). There are also a
few more functions, such as `heads(<set>)`, which filters out revisions in the
cli: make `log` show only local commits by default The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.
2022-05-14 15:55:46 +00:00
input set if they're ancestors of other revisions in the set.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
## Conflicts
Now let's see how Jujutsu deals with merge conflicts. We'll start by making some
commits:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
# Start creating a chain of commits off of the `master` branch
$ jj new master -m A; echo a > file1
Working copy now at: 00a2aeed556a A
cli: make "added {} files, modified {} files, ..." message start with uppercase We pretty consistently start with uppercase so this message stood out and bothered me.
2021-10-24 06:51:16 +00:00
Added 0 files, modified 1 files, removed 0 files
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj new -m B1; echo b1 > file1
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: 967d9f9fd288 B1
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj new -m B2; echo b2 > file1
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: 8ebeaffa332b B2
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj new -m C; echo c > file2
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: 62a3c6d315cd C
replace references to `jj l` with `jj log`
2022-05-26 15:10:31 +00:00
$ jj log
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ qzvqqupxlkot martinvonz@google.com 2023-02-12 15:07:41.946 -08:00 2370ddf3fa39
│ C
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ puqltuttrvzp martinvonz@google.com 2023-02-12 15:07:33.000 -08:00 daa6ffd5a09a
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ B2
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ ovknlmrokpkl martinvonz@google.com 2023-02-12 15:07:24.000 -08:00 7d7c6e6bd0b4
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ B1
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ nuvyytnqlquo martinvonz@google.com 2023-02-12 15:07:05.000 -08:00 5dda2f097aa9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ A
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ kntqzsqtnspv martinvonz@google.com 2023-02-12 14:56:59.000 -08:00 5d39e19dac36
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ Say goodbye
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ orrkosyozysx octocat@nowhere.com 2012-03-06 15:06:50.000 -08:00 master 7fd1a60b01f9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ (empty) Merge pull request #6 from Spaceghost/patch-1
~
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
We now have a few commits, where A, B1, and B2 modify the same file, while C
docs: update tutorial with new conflict handling in the working copy
2021-11-06 23:17:51 +00:00
modifies a different file. Let's now rebase B2 directly onto A:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
$ jj rebase -s puqltuttrvzp -d nuvyytnqlquo
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
Rebased 2 commits
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: 1978b53430cd C
cli: print "Added X files, ..." message only if any files changed Looking at the impact on the smoke test and the tutorial, I think I went overboard in 83c0519. Let's only print the message if any files changed.
2021-11-20 07:03:25 +00:00
Added 0 files, modified 1 files, removed 0 files
replace references to `jj l` with `jj log`
2022-05-26 15:10:31 +00:00
$ jj log
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ qzvqqupxlkot martinvonz@google.com 2023-02-12 15:08:33.000 -08:00 1978b53430cd conflict
│ C
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ puqltuttrvzp martinvonz@google.com 2023-02-12 15:08:33.000 -08:00 f7fb5943ee41 conflict
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ B2
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ ovknlmrokpkl martinvonz@google.com 2023-02-12 15:07:24.000 -08:00 7d7c6e6bd0b4
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ B1
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ nuvyytnqlquo martinvonz@google.com 2023-02-12 15:07:05.000 -08:00 5dda2f097aa9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ A
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ kntqzsqtnspv martinvonz@google.com 2023-02-12 14:56:59.000 -08:00 5d39e19dac36
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ Say goodbye
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ orrkosyozysx octocat@nowhere.com 2012-03-06 15:06:50.000 -08:00 master 7fd1a60b01f9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ (empty) Merge pull request #6 from Spaceghost/patch-1
~
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
There are several things worth noting here. First, the `jj rebase` command said
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
"Rebased 2 commits". That's because we asked it to rebase commit B2 with the
`-s` option, which also rebases descendants (commit C in this case). Second,
because B2 modified the same file (and word) as B1, rebasing
replace references to `jj l` with `jj log`
2022-05-26 15:10:31 +00:00
it resulted in conflicts, as the `jj log` output indicates. Third, the conflicts
docs: update tutorial with new conflict handling in the working copy
2021-11-06 23:17:51 +00:00
did not prevent the rebase from completing successfully, nor did it prevent C
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
from getting rebased on top.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
Now let's resolve the conflict in B2. We'll do that by creating a new commit on
top of B2. Once we've resolved the conflict, we'll squash the conflict
resolution into the conflicted B2. That might look like this:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
$ jj new puqltuttrvzp # Replace the ID by what you have for B2
Working copy now at: c7068d1c23fd (no description set)
Added 0 files, modified 0 files, removed 1 files
docs: update tutorial with new conflict handling in the working copy
2021-11-06 23:17:51 +00:00
$ jj st
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Parent commit: f7fb5943ee41 B2
Working copy : c7068d1c23fd (no description set)
docs: update tutorial with new conflict handling in the working copy
2021-11-06 23:17:51 +00:00
The working copy is clean
There are unresolved conflicts at these paths:
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
file1 2-sided conflict
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
$ cat file1
<<<<<<<
conflicts: change diff line marker to %%%%%%% I feel the original -------/+++++++ pair is slightly confusing because each half can be a separator by itself. I don't know what character other than '-'/'+' is preferred, but let's pick '%' (for "mod") per @martinvonz suggestion.
2022-09-20 03:31:20 +00:00
%%%%%%%
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
-b1
+a
+++++++
b2
>>>>>>>
$ echo resolved > file1
$ jj squash
Rebased 1 descendant commits
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: e3c279cc2043 (no description set)
replace references to `jj l` with `jj log`
2022-05-26 15:10:31 +00:00
$ jj log
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ ntxxqymrlvxu martinvonz@google.com 2023-02-12 19:34:09.000 -08:00 e3c279cc2043
│ (empty) (no description set)
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ qzvqqupxlkot martinvonz@google.com 2023-02-12 19:34:09.000 -08:00 b9da9d28b26b
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ C
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ puqltuttrvzp martinvonz@google.com 2023-02-12 19:34:09.000 -08:00 2c7a658e2586
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ B2
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ ovknlmrokpkl martinvonz@google.com 2023-02-12 15:07:24.000 -08:00 7d7c6e6bd0b4
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ B1
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ nuvyytnqlquo martinvonz@google.com 2023-02-12 15:07:05.000 -08:00 5dda2f097aa9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ A
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ kntqzsqtnspv martinvonz@google.com 2023-02-12 14:56:59.000 -08:00 5d39e19dac36
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ Say goodbye
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ orrkosyozysx octocat@nowhere.com 2012-03-06 15:06:50.000 -08:00 master 7fd1a60b01f9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ (empty) Merge pull request #6 from Spaceghost/patch-1
~
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
Note that commit C automatically got rebased on top of the resolved B2, and that
C is also resolved (since it modified only a different file).
cli: rename `jj prune` to `jj abandon` The command's help text says "Abandon a revision", which I think is a good indication that the command's name should be `abandon`. This patch renames the command and other user-facing occurrences of the word. The remaining occurrences should be removed when I remove support for evolution.
2021-09-20 04:19:47 +00:00
By the way, if we want to get rid of B1 now, we can run `jj abandon
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
ovknlmrokpkl`. That will hide the commit from the log output and will rebase any
cli: rename `jj prune` to `jj abandon` The command's help text says "Abandon a revision", which I think is a good indication that the command's name should be `abandon`. This patch renames the command and other user-facing occurrences of the word. The remaining occurrences should be removed when I remove support for evolution.
2021-09-20 04:19:47 +00:00
descendants to its parent.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
## The operation log
Jujutsu keeps a record of all changes you've made to the repo in what's called
the "operation log". Use the `jj op` (short for `jj operation`) family of
commands to interact with it. To list the operations, use `jj op log`:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
$ jj op log
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ d3b77addea49 martinvonz@vonz.svl.corp.google.com 2023-02-12 19:34:09.549 -08:00 - 2023-02-12 19:34:09.552 -08:00
│ squash commit 63874fe6c4fba405ffc38b0dd926f03b715cf7ef
│ args: jj squash
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ 6fc1873c1180 martinvonz@vonz.svl.corp.google.com 2023-02-12 19:34:09.548 -08:00 - 2023-02-12 19:34:09.549 -08:00
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ snapshot working copy
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ ed91f7bcc1fb martinvonz@vonz.svl.corp.google.com 2023-02-12 19:32:46.007 -08:00 - 2023-02-12 19:32:46.008 -08:00
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ new empty commit
│ args: jj new puqltuttrvzp
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ 367400773f87 martinvonz@vonz.svl.corp.google.com 2023-02-12 15:08:33.917 -08:00 - 2023-02-12 15:08:33.920 -08:00
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ rebase commit daa6ffd5a09a8a7d09a65796194e69b7ed0a566d and descendants
│ args: jj rebase -s puqltuttrvzp -d nuvyytnqlquo
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
[many more lines]
```
docs: use simpler `jj undo` alias instead of `jj op undo`
2021-11-20 18:30:21 +00:00
The most useful command is `jj undo` (alias for `jj op undo`), which will undo
an operation. By default, it will undo the most recent operation. Let's try it:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
docs: use simpler `jj undo` alias instead of `jj op undo`
2021-11-20 18:30:21 +00:00
$ jj undo
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: 63874fe6c4fb (no description set)
replace references to `jj l` with `jj log`
2022-05-26 15:10:31 +00:00
$ jj log
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ zxoosnnpvvpn martinvonz@google.com 2023-02-12 19:34:09.000 -08:00 63874fe6c4fb
│ (no description set)
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ qzvqqupxlkot martinvonz@google.com 2023-02-12 15:08:33.000 -08:00 1978b53430cd conflict
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ C
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ puqltuttrvzp martinvonz@google.com 2023-02-12 15:08:33.000 -08:00 f7fb5943ee41 conflict
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ B2
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ ovknlmrokpkl martinvonz@google.com 2023-02-12 15:07:24.000 -08:00 7d7c6e6bd0b4
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ B1
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ nuvyytnqlquo martinvonz@google.com 2023-02-12 15:07:05.000 -08:00 5dda2f097aa9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ A
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
│ ◉ kntqzsqtnspv martinvonz@google.com 2023-02-12 14:56:59.000 -08:00 5d39e19dac36
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
├─╯ Say goodbye
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ orrkosyozysx octocat@nowhere.com 2012-03-06 15:06:50.000 -08:00 master 7fd1a60b01f9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ (empty) Merge pull request #6 from Spaceghost/patch-1
~
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
As you can perhaps see, that undid the `jj squash` invocation we used for
squashing the conflict resolution into commit B2 earlier. Notice that it also
updated the working copy.
You can also view the repo the way it looked after some earlier operation. For
replace references to `jj l` with `jj log`
2022-05-26 15:10:31 +00:00
example, if you want to see `jj log` output right after the `jj rebase` operation,
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
try `jj log --at-op=367400773f87` but use the hash from your own `jj op log`.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
## Moving content changes between commits
You have already seen how `jj squash` can combine the changes from two commits
into one. There are several other commands for changing the contents of existing
docs: describe how to configure `scm-diff-editor`
2023-06-20 10:21:02 +00:00
commits. These commands assume that you have `meld` installed. If you prefer a
terminal-based diff editor, you
can [configure `scm-diff-editor`](config.md#setting-up-scm-diff-editor) instead.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
We'll need some more complex content to test these commands, so let's create a
few more commits:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
$ jj new master -m abc; printf 'a\nb\nc\n' > file
Working copy now at: f94e49cf2547 abc
cli: make "added {} files, modified {} files, ..." message start with uppercase We pretty consistently start with uppercase so this message stood out and bothered me.
2021-10-24 06:51:16 +00:00
Added 0 files, modified 0 files, removed 1 files
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj new -m ABC; printf 'A\nB\nc\n' > file
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: 6f30cd1fb351 ABC
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj new -m ABCD; printf 'A\nB\nC\nD\n' > file
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: a67491542e10 ABCD
docs: revert to using revset operator `:` instead of `::` Since our latest release doesn't support `::`, we shouldn't tell the user to use it. This commit should be backed out once we've released jj 0.9.0.
2023-08-01 21:30:52 +00:00
$ jj log -r master:@
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
@ mrxqplykzpkw martinvonz@google.com 2023-02-12 19:38:21.000 -08:00 b98c607bf87f
│ ABCD
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ kwtuwqnmqyqp martinvonz@google.com 2023-02-12 19:38:12.000 -08:00 30aecc0871ea
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ ABC
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ ztqrpvnwqqnq martinvonz@google.com 2023-02-12 19:38:03.000 -08:00 510022615871
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ abc
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ orrkosyozysx octocat@nowhere.com 2012-03-06 15:06:50.000 -08:00 master 7fd1a60b01f9
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
│ (empty) Merge pull request #6 from Spaceghost/patch-1
~
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
We "forgot" to capitalize "c" in the second commit when we capitalized the other
letters. We then fixed that in the third commit when we also added "D". It would
be cleaner to move the capitalization of "c" into the second commit. We can do
that by running `jj squash -i` (short for `jj squash --interactive`) on the
third commit. Remember that `jj squash` moves all the changes from one commit
into its parent. `jj squash -i` moves only part of the changes into its parent.
Now try that:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj squash -i
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Using default editor 'meld'; you can change this by setting ui.diff-editor
Working copy now at: 52a6c7fda1e3 ABCD
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
That will bring up Meld with a diff of the changes in the "ABCD" commit. Modify
the right side of the diff to have the desired end state in "ABC" by removing
tutorial: clarify that files need to be saved before closing editors As suggested in #1386.
2023-03-17 05:11:38 +00:00
the "D" line. Then save the changes and close Meld. If we look at the diff of
the second commit, we now see that all three lines got capitalized:
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
$ jj diff -r @-
docs: update tutorial with removed "at" from diff headers I forgot to include this in the previous commit.
2021-10-22 20:04:20 +00:00
Modified regular file file:
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
1 1: aA
2 2: bB
3 3: cC
```
The child change ("ABCD" in our case) will have the same content *state* after
the `jj squash` command. That means that you can move any changes you want into
the parent change, even if they touch the same word, and it won't cause any
conflicts.
Let's try one final command for changing the contents of an exiting commit. That
Rename `jj touchup` to `jj diffedit`
2022-12-18 03:56:21 +00:00
command is `jj diffedit`, which lets you edit the contents of a commit without
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
checking it out.
docs: change "shell script" codeblock to "shell" ```shell script ``` breaks mkdocs rendering
2023-08-13 01:38:57 +00:00
```shell
Rename `jj touchup` to `jj diffedit`
2022-12-18 03:56:21 +00:00
$ jj diffedit -r @-
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Using default editor 'meld'; you can change this by setting ui.diff-editor
Created 70985eaa924f ABC
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
Rebased 1 descendant commits
tutorial: update with recent changes, plus some other editing We have made some changes to CLI output that had not made it into the tutorial. It's time to update it, especially with the new change id rendering. Since I'm updating it now, and since it's a bit of work to do so, I decided to use GitHub's Hello-World repo instead of jj's own repo as our example.
2023-02-12 22:37:50 +00:00
Working copy now at: 1c72cd50525d ABCD
cli: print "Added X files, ..." message only if any files changed Looking at the impact on the smoke test and the tutorial, I think I went overboard in 83c0519. Let's only print the message if any files changed.
2021-11-20 07:03:25 +00:00
Added 0 files, modified 1 files, removed 0 files
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
```
When Meld starts, edit the right side by e.g. adding something to the first
tutorial: clarify that files need to be saved before closing editors As suggested in #1386.
2023-03-17 05:11:38 +00:00
line. Then save the changes and close Meld. You can now inspect the rewritten
commit with `jj diff -r @-` again and you should see your addition to the first
line. Unlike `jj squash -i`, which left the content state of the commit
unchanged, `jj diffedit` (typically) results in a different state, which means
that descendant commits may have conflicts.
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
cmd: Remove the `-i` option to `jj restore`. It is superceded by the new options to the `jj diffedit` command.
2022-12-21 01:36:51 +00:00
Other commands for rewriting contents of existing commits are `jj split`, `jj
unsquash -i` and `jj move -i`. Now that you've seen how `jj squash -i` and `jj
diffedit` work, you can hopefully figure out how those work (with the help of
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 17:56:22 +00:00
the instructions in the diff).
Copy permalink