Joy Reynolds
Joy Reynolds
> If you think about it like moving commits around the DAG, you are wrong, and you will not understand why you are getting conflicts, or really what you are...
Alternative? : part of the alias could be `op log` to capture the ID of the current state and that is what you `op revert` to.
I think "perfect DX" would be different in every situation.
I didn't follow most of this discussion of options, probably because of use of the word `restore`. I can't seem to get a mental model of what is happening, and...
> Perhaps, it's hard to understand because this flag controls the implicit behavior which the user shouldn't normally care. Yes, this! I agree that having a separate command would be...
Does `--no-rebase` fit? or `--no-adjust`
> This is still unintuitive to me because it doesn't make sense (in patch-based thinking) that there is a command for "squash, and also rewrite the affected commits' children to...
I was rereading the FAQ about this, and this time I understood it better. The option name that came to mind was `--isolate`, but it starts with i, so maybe...
Doesn't this all exist in one file? And the point of Diffuse is to compare multiple files? Perhaps you should look into trying [Jujutsu](https://github.com/jj-vcs/jj/), which has multiple ways to display...