martinvonz

35 ms·

121.
by martinvonz 5y ago
That would work, yes, but there's also `jj squash -i` to move part of the child commit into the parent. There's also the more generic `jj move` command for moving part of any commit into any other commit (ancestor, descendant, sib
122.
by martinvonz 5y ago
Note, though, that it depends on libgit2 (which is written in C). (As pointed out by someone in https://github.com/martinvonz/jj/issues/56 .)
123.
by martinvonz 5y ago
> For example, "when the working copy is automatically committed," where does it go? It becomes a regular git commit with a git ref called something like `refs/jj/keep/9f1a0fb0-a0aa-4a4b-922f-d6d48687996a` pointi
124.
by martinvonz 5y ago
> I am interested in how to do this with jj `jj split -r <commit>`, where `<commit>` may be the working copy commit (which is the default). See https://github.com/martinvonz/jj/blob/main/do
125.
by martinvonz 5y ago
> I feel like Git is sufficiently complex - no more than it needs to be and certainly not less. Perhaps the biggest mistake (IMO) was to expose the index to the user. I happened to just watch https://www.youtube.com/watch
126.
by martinvonz 5y ago
> You lost me at "free from the index". If you click the link that text points you to (i.e. https://github.com/martinvonz/jj/blob/main/docs/git-comparis... ), there's an explanation
127.
by martinvonz 5y ago
Thanks! > Did you consider the recent git nomenclature change to use "switch" for branch operations, and "co" for file operations? Actually, isn't "restore" for file operations? My impression was that e
128.
by martinvonz 5y ago
If you like Fig and want a similar (but better, IMO) UX that can be used with Git repos, you may want to try my project: https://github.com/martinvonz/jj . It's also pretty fast (can rebase >1k commits in <1s
129.
by martinvonz 5y ago
If you're looking for undo functionality, a simpler CLI and lots of other features for your Git repo, consider checking out my project: https://github.com/martinvonz/jj .
130.
by martinvonz 5y ago
I'd like to think it was my project ( https://github.com/martinvonz/jj ), but other possibilities include Gitless ( https://gitless.com/ ) or Bazaar ( https://bazaar.canonical.com/ ).
131.
by martinvonz 5y ago
Or my own project: https://github.com/martinvonz/jj . I think https://github.com/Byron/gitoxide also plans to provide a different CLI, but I don't think they've started working on it.
132.
Design of a lock-free DVCS (rsync-/Dropbox-/NFS-safe)(github.com)
1 points by martinvonz 5y ago|0 comments
133.
by martinvonz 5y ago
> However, if you're claiming to make a system including "the best" of these three tools, any reader will expect the obvious property that Jujutsu can faithfully simulate all possible workflows from these tools. I'm a
134.
by martinvonz 5y ago
I was referring to the "first-class conflicts" bit. I included the question mark at the end of the title because it's obviously very subjective what the best part of each VCS is.
135.
Show HN: The Best of Git, Mercurial, and Pijul in One VCS?(github.com)
2 points by martinvonz 5y ago|4 comments
136.
by martinvonz 5y ago
See https://stackoverflow.com/questions/5600659/rebasing-a-branc... and its many duplicates. I think that's what users typically want.
137.
by martinvonz 5y ago
The CLI could be simpler without making it less powerful. For example, "the index" should not be visible to the user, IMO. The usecases it enables can be achieved with a simpler CLI (like Mercurial does). Also, stashing could be a
138.
by martinvonz 5y ago
There are tools out there that attempt to provide a simpler and/or more powerful CLI while letting you collaborate with others on existing Git repos. Gitless has already been mentioned here, but there's also my own tool ( https:&#
139.
by martinvonz 5y ago
Any command that depends on the working copy commit will first check if it needs to create a new commit from the working copy contents. So when you run e.g. `jj status`, it will amend the current working copy commit if there are changes. In
140.
by martinvonz 5y ago
If the Pijul feature you care most about is "first-class conflicts", you may want to check out my VCS: https://github.com/martinvonz/jj . It has git interop.