mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-04 05:28:02 +00:00
50ba571527
We have talked about showing the commit ID only for divergent changes because it's generally easier to work with the change ID, and it's less likely to result in a divergent change. However, it's useful to have the commit ID available for pasting into e.g. a commit message or the GitHub UI. To try to steer users towards using the change ID, this commit moves the commit ID off to the right in the log output. I put it just after the "divergent" field, because that makes it close to how I imagine it would look if we decided to hide the commit ID except for divergent changes. I was thinking that could be rendered as "divergent (abc123)". So if we add config to hide the commit ID, then it would be rendered almost the same for divergent commits (just with the added parentheses). It would also make sense to replace the "divergent" field by a question mark on the change ID, since change IDs basically behave like branches. If we do that, then the placement of the commit ID I picked in this commit does not make sense. |
||
|---|---|---|
| .. | ||
| demo_git_compat.sh | ||
| demo_helpers.sh | ||
| demo_juggle_conflicts.sh | ||
| demo_operation_log.sh | ||
| demo_resolve_conflict.sh | ||
| demo_working_copy.sh | ||
| git_compat.png | ||
| juggle_conflicts.png | ||
| operation_log.png | ||
| resolve_conflicts.png | ||
| working_copy.png | ||
