Martin von Zweigbergk
f4cadff6e1
README: description additional installation steps for Mac
...
I'm not sure which steps are needed and what they depend on (I didn't
need the `pkg-config` bits), so the steps are a little vague for now.
Closes #62 .
2022-02-19 23:23:58 -08:00
Martin von Zweigbergk
4a0bd07e8c
README: add note about use of libgit2 C library
...
Closes #56 .
2022-02-19 22:55:48 -08:00
Martin von Zweigbergk
819ad475f5
docs: give Google credit for letting this be my 20% project
...
This has been my 20% for at least a year (dedicating most of my
Wednesdays to it), so let's give Google some credit for that in the
README.
2022-02-08 09:59:28 -08:00
Martin von Zweigbergk
8fe21b0438
docs: mention history rewriting as a feature in README
...
I think we have better support rewriting history than most other tools
do, so it seems worth mentioning.
2022-01-28 23:07:52 -08:00
Martin von Zweigbergk
377741c5c6
docs: make "features" in readme a heading with sub-headings instead of bullets
...
The list of features outgrew the bullet form a long time ago...
2022-01-28 22:45:55 -08:00
Martin von Zweigbergk
67b731b34a
docs: mention concurrency as a feature in README
2022-01-10 13:05:29 -08:00
Martin von Zweigbergk
037d66965d
docs: start documenting Git compatibility
2022-01-03 22:40:58 -08:00
Martin von Zweigbergk
93250fe6c8
docs: link from README to post about rebase speed
...
For now, the best documentation we have of how fast `jj` is is the
GitHub discussion about rebase speed.
2022-01-03 21:36:56 -08:00
Martin von Zweigbergk
f9e6b263a1
docs: explain how not exposing "the index" in the UI is a good thing
2021-12-18 09:22:35 -08:00
Martin von Zweigbergk
71b0233efb
docs: add doc about a first-class conflicts
2021-12-18 08:07:28 -08:00
Martin von Zweigbergk
ef4dbf216f
docs: add links from README to detailed docs
2021-12-18 08:01:47 -08:00
Martin von Zweigbergk
423a894cba
docs: consistently use hyphens in filenames
2021-12-18 07:56:48 -08:00
Martin von Zweigbergk
4c71c763e9
docs: document revsets ( #46 )
...
Now that revset operators are not as embarrassing as before, let's
document them.
2021-12-15 16:56:45 -08:00
Martin von Zweigbergk
6b0a568e44
docs: add pointer from README to Git-comparison doc
2021-11-18 22:06:15 -08:00
Martin von Zweigbergk
9375106a05
cli: use same color for timestamps in operation log as in commit log
2021-11-07 21:41:22 -08:00
Martin von Zweigbergk
798b4bc897
demos: add demo showing how conflicting commits can be rebased etc
2021-11-07 15:17:51 -08:00
Martin von Zweigbergk
bf64f89521
demos: update conflict-resolution demo with recent changes
...
Conflicts are now preserved in the working copy until their conflict
markers are gone (they used to be considered resolved).
2021-11-07 15:17:51 -08:00
Martin von Zweigbergk
d37e484fc8
docs: explain what the tool is about, not why I started it
2021-10-28 15:01:19 -07:00
Martin von Zweigbergk
c293638028
docs: add more detail about the project status (like what's missing)
2021-10-28 15:01:19 -07:00
Martin von Zweigbergk
5c0e929b29
docs: add a "Related Work" section to README
2021-10-28 15:01:19 -07:00
Martin von Zweigbergk
98337e819d
demos: add more jj log calls to the working-copy demo
...
Thanks to @arxanas for the suggestion.
2021-10-27 21:16:29 -07:00
Martin von Zweigbergk
4f8632519b
docs: update demo links with recent changes
2021-10-27 18:12:21 -07:00
Martin von Zweigbergk
3c6a922b97
docs: don't hide demos in collapsed regions in the README
2021-10-27 16:09:05 -07:00
Martin von Zweigbergk
a3a13f8bbf
demos: update demo recordings with stable graph edge ordering
2021-10-23 20:45:51 -07:00
Martin von Zweigbergk
5acd360e86
demos: update conflict-resolution demo link to a lower-resolution version
...
I forgot to make my terminal window smaller before recording the
previous version.
2021-10-23 14:48:08 -07:00
Martin von Zweigbergk
c661181e08
demos: add demo of basic conflict resolution
2021-10-23 14:40:33 -07:00
Martin von Zweigbergk
97612f9e99
demos: add demo of the operation log
2021-10-22 23:52:16 -07:00
Martin von Zweigbergk
74e21acd02
demos: add demo of automatic working copy commit
2021-10-22 21:59:07 -07:00
Martin von Zweigbergk
2dd0bf7b12
demos: type faster, pause more
...
I find it frustrating to wait for the typing, but I need much more
time to think between commands (and users who are new to the tool
surely need even more time).
2021-10-22 18:36:00 -07:00
Martin von Zweigbergk
234cb15ff8
demos: add automated demo of cloning Git repo
...
The automation is mostly copied from
https://github.com/arxanas/git-branchless/tree/master/demos , so big
thanks to @arxanas for writing that!
2021-10-22 13:56:30 -07:00
Martin von Zweigbergk
ca796b49f0
docs: describe how to set up commmand-line completion
2021-10-13 20:45:55 -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
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
0e3b4b406a
README: remove the empty "Future plans" section
...
This section has always been empty (IIRC). I think we'll use GitHub
issues for tracking remaining work instead.
2021-10-13 08:44:29 -07:00
Martin von Zweigbergk
f33117b2f8
README: update to describe "automatic rebase" instead of evolution ( #32 )
2021-10-03 12:01:14 -07:00
Martin von Zweigbergk
880d469b5f
readme: fix typoed "tutorial"
2021-09-20 09:02:40 -07:00
Martin von Zweigbergk
4aa1fd7cbb
docs: move tutorial from README.md to docs/tutorial.md
2021-09-09 11:10:40 -07:00
Martin von Zweigbergk
77662c0674
readme: add "Status" section and stop saying it's not ready for use
...
I have been using the tool myself for 7-8 months now, and the UX has
improved substantially, so I think it's ready for use.
2021-09-08 10:40:13 -07:00
Martin von Zweigbergk
538bec22ff
tutorial: clarify that rustup install nightly doesn't change the default
2021-09-01 08:08:18 -07:00
Martin von Zweigbergk
f13f15e057
cli: add jj rebase -s and make jj rebase -r rebase descendants onto parents
...
I think it makes sense to have a version of rebase that rebases the
descendants of the rebased commit onto the parents of the rebased
commit. Let's make `jj rebase -r` do just that. Let's also add `jj
rebase -s` (matching Mercurial's `hg rebase -s`) for rebasing a commit
and its descendants onto another commit.
Since both flavors of the command now explicitly rebase the
descendants (just to different destinations), I also made the command
not evolve orphans afterwards. That would have made sense regardless
of this commit.
2021-08-28 10:01:00 -07:00
Martin von Zweigbergk
52678237a7
cli: after cloning git repo, update to remote's HEAD
2021-08-25 21:42:32 -07:00
Martin von Zweigbergk
aeab6660d9
revsets: add branches() and tags() functions
...
The `branches()` function resolves to all "adds" on both local and
remote branches.
2021-08-04 12:03:13 -07:00
Martin von Zweigbergk
15132a1166
cli: replace git refs by branches and tags in log output
...
Now that our own branches and tags are updated when git refs are
updated and the user can use them to specify revisions, we can start
displaying them instead of the git refs. This commit adds new
`branches` and `tags` template keywords and updates the default
templates to use them instead of `git_refs`.
2021-08-04 11:53:37 -07:00
Martin von Zweigbergk
203843fc75
readme: some clarifications and minor grammatical corrections
2021-07-08 15:45:49 -07:00
Martin von Zweigbergk
443528159e
conflicts: use new multi-way diff for materialized multi-way conflicts
...
This copies the conflict marker format I added a while ago to
Mercurial (https://phab.mercurial-scm.org/D9551 ), except that it uses
`+++++++` instead of `=======` for sections that are pure adds. The
reason I made that change is because we also have support for pure
removes (Mercurial never ends up in that situation because it has
exactly one remove and two adds).
This change resolves part of issue #19 .
2021-06-30 12:29:20 -07:00
Martin von Zweigbergk
d34a651087
tutorial: update installation instructions to use nightly toolchain
2021-06-04 08:11:17 -07:00
Martin von Zweigbergk
fc86b3f693
tutorial: prefer change ids over commit ids
2021-06-02 13:56:16 -07:00
Martin von Zweigbergk
ae5d1a985e
tutorial: delete obsolete reference to "<--" in the log output
2021-06-02 13:44:13 -07:00
Martin von Zweigbergk
4e3ac9de1b
tutorial: update git change ids to use new (bit-reversed) values
...
I forgot to update the tutorial in commit ca1df00e05
2021-06-02 13:42:25 -07:00
Martin von Zweigbergk
edef604c88
cli: use "@" in graph to indicate the current checkout and head operation
...
This both helps find the current checkout and head operation and
hopefully helps teach the user that "@" is the symbol for the working
copy. I removed the current "<--" indication from the graph (and
non-graph) log template. Hopefully the "@" is clear enough on its own,
but we may want to add back some further indication later. We'll see.
2021-05-31 10:54:00 -07:00
Martin von Zweigbergk
03ea8779df
cli: make diff editor configurable
...
This patch adds a simple `ui.diff-editor` config, which defaults to
`meld`. This fixes issue #10 .
2021-05-31 09:40:29 -07:00
Martin von Zweigbergk
38a3462d4e
cli: clarify "Now at: <commit>" message as "Working copy now at: <commit>"
...
I considered even changing the message to "Checking out: <commit>" as
that's technically more correct (the message is printed when the
view's checkout is updated, i.e. before the working copy is
updated). However, I worried that users would find it confusing that
e.g. `jj close` would result in a "Checking out: " message, even
though that's what actually happens.
2021-05-31 09:01:59 -07:00
Martin von Zweigbergk
83c460449b
cli: remove overly verbose "Leaving: <commit>" message
...
I remember adding that message a long time ago so the user has a trace
of working copy commit ids in the terminal output. They should be able
to get the same information from the operation log combined with
e.g. `jj st --at-op`.
2021-05-31 08:55:08 -07:00
Martin von Zweigbergk
082b34206e
cli: abbreviate operation ids to 12 hex digits
2021-05-28 22:48:39 -07:00
Martin von Zweigbergk
0328381c6c
docs: rewrite README to target users, not developers
...
The project is starting to work well enough that I think it's time
that the documentation targets users instead of VCS hackers. This
patch rewrites much of the README to describe how the features help
the user instead of describing how they work. It also adds a tutorial.
2021-05-26 15:12:20 -07:00
Martin von Zweigbergk
d42e6c77b2
project: rename project from Jujube to Jujutsu
...
"Jujutsu" is probably much more familiar and relatable to most
people. Also, I'm still not sure how "jujube" is supposed to be
pronounced :P
2021-05-15 10:28:40 -07:00
Martin von Zweigbergk
2879d817dd
readme: some further touch-up, plus a correction about in-tree conflicts
2021-01-20 00:06:42 -08:00
Martin von Zweigbergk
7572a32077
readme: some very minor improvements
2021-01-05 22:39:11 -08:00
Erjan Kalybek
06401fc30d
Fix typo
2020-12-26 12:12:24 -08:00
Martin von Zweigbergk
2d9aa08334
readme: fix two more little typos
2020-12-18 15:46:49 -08:00
Martin von Zweigbergk
9f4c3bab5e
readme: drop repeated "a merge commit"
2020-12-18 14:35:12 -08:00
Martin von Zweigbergk
4f045561e6
replace placeholder README.md with real content
2020-12-14 08:41:52 -08:00
Martin von Zweigbergk
25caaa0081
Boilerplate for new Google open source project
2020-12-11 23:37:59 -08:00
