Martin von Zweigbergk
095fb9fef4
config: drop support for ~/.jjconfig
...
I'm a little hesitant to do this because most tools I'm familiar with
have the config file directly in `~/`. It's also easier to describe
where to put the file if it doesn't vary across platforms. But we're
still early in the project, so let's try it and see if we get any
complaints.
2022-03-23 09:57:42 -07:00
Martin von Zweigbergk
9ec0e4c1bb
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.
2022-01-05 12:38:52 -08:00
Martin von Zweigbergk
588389e89f
docs: add pointer to new revset doc in tutorial ( #46 )
2021-12-15 21:41:11 -08:00
Martin von Zweigbergk
c185b395f6
revsets: swap meaning of operators ~ and - ( #46 )
...
As suggested by @arxanas, this makes `-` symmetric with `+` and `-` is
easier to type than `~`.
2021-12-12 23:02:29 -08:00
Martin von Zweigbergk
35a712cc48
revsets: change Git-like range operator ,,, operator to .. ( #46 )
2021-12-12 00:20:00 -08:00
Martin von Zweigbergk
98659a16e1
revsets: change DAG range operator ,, operator to : ( #46 )
2021-12-12 00:20:00 -08:00
Martin von Zweigbergk
63c90c04c8
revsets: change parent/children operators to foo~/foo+ ( #46 )
2021-12-11 23:47:34 -08:00
Martin von Zweigbergk
698b92adc4
docs: update tutorial to mention jj untrack
...
I forgot to update the tutorial when I closed #14 .
2021-12-01 09:56:58 -08:00
Martin von Zweigbergk
813ae0276d
docs: use simpler jj undo alias instead of jj op undo
2021-11-20 10:33:55 -08:00
Martin von Zweigbergk
d34060f013
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
2021-11-19 23:14:19 -08:00
Martin von Zweigbergk
2796b5a8e1
docs: update tutorial with new conflict handling in the working copy
2021-11-07 15:17:51 -08:00
Martin von Zweigbergk
6687f98d8a
cli and docs: replace "id" by more correct "ID"
2021-10-27 15:06:10 -07:00
Martin von Zweigbergk
191c1ee166
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 12:46:01 -07:00
Martin von Zweigbergk
f35f2f0c97
docs: update tutorial with removed "at" from diff headers
...
I forgot to include this in the previous commit.
2021-10-22 13:05:04 -07:00
Martin von Zweigbergk
579bd4b3bf
docs: update alias in tutorial to not use public_heads() revset
...
We don't update public heads very well yet and I'd like to take a
shortcut and simply not have care about public heads for now.
2021-10-20 14:19:04 -07:00
Martin von Zweigbergk
c3ac110f3b
tutorial: avoid a "the same repo" referring back to installation instructions
2021-10-18 08:49:00 -07:00
Martin von Zweigbergk
56e0f1254b
docs: move initial configuration from tutorial to README
...
It seems better to have all the one-time setup in the README.
2021-10-13 20:37:48 -07:00
Martin von Zweigbergk
08b5193942
docs: update tutorial with new diff headers
...
I forgot to update the tutorial in the previous commit.
2021-10-13 16:13:25 -07:00
Martin von Zweigbergk
8fef1c2068
docs: move installation instructions from tutorial to README
...
I also changed the instructions to use `cargo install --git` pointing
straight to GitHub, so we don't have the naming conflict with the jj
repo created in the tutorial.
2021-10-13 08:52:40 -07:00
Martin von Zweigbergk
ae7f00e7b1
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-19 22:51:12 -07:00
Martin von Zweigbergk
4aa1fd7cbb
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 11:10:40 -07:00
