5 commits

Author	SHA1	Message	Date
Martin von Zweigbergk	71c789f50b	cli: make log show only local commits by default ... The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.	2022-05-14 11:50:05 -07: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	571336b827	demos: add some blank lines to separate groups of commands (and comments)	2021-10-27 16:55:59 -07:00
Martin von Zweigbergk	04e54b093d	demos: make comment lines shorter, to better fit on mobile	2021-10-27 16:09:01 -07:00
Martin von Zweigbergk	c661181e08	demos: add demo of basic conflict resolution	2021-10-23 14:40:33 -07:00