cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-23 16:11:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,150 Commits 145 Branches 36 Tags
Commit Graph

3 Commits

Author SHA1 Message Date
Martin von Zweigbergk
a80259c7d3 cli: say that jj chmod errors out if there are any non-file sides 
`jj chmod` won't operate on conflicts involving non-files on the
positive sides. However, the error message says "None of the sides of
the conflict are files", which is not correct.
 2023-08-14 18:15:34 -07:00
Ilya Grigoriev
6fa8a25839 cli templates: include branches in short commit description 
They are shown next to the change and commit id, since they are other names the
commit can be referred by. 

The description is separated from the branches by a ` | ` when there are
branches, so that one can tell the branches from the description without color.

The result looks like this: ![image](https://github.com/martinvonz/jj/assets/4123047/a38aff7b-2b47-49e6-8461-c42e8eb535a4)
 2023-08-10 20:58:40 -07:00
Martin von Zweigbergk
0075174308 tests: move tests/ under cli/ so they're run again 
Thanks to @ilyagr for noticing that they should be moved.
 2023-08-05 06:18:59 +00:00