I’ve always wanted a git with five commands, and maybe with AST based diffing

simcop2387 5 hours ago | parent | next [-]

The five command part isn't really possible but you can use custom diffs for merges, git diff, etc. pretty easily. There are projects like diffsitter ( https://github.com/afnanenayet/diffsitter ) for doing more intelligent diffs like this for supported languages.

EDIT: and then an example for the merge stuff I couldn't find while typing before: https://mergiraf.org/ and HN discussion a few years ago: https://news.ycombinator.com/item?id=42093756

▲

gritzko 3 hours ago | parent | next [-]

Five is enough. Beagle uses five HTTP verbs: GET, POST, PUT, DELETE, PATCH. And it is syntax-aware.

https://replicated.wiki/blog/uris.html

▲

frollogaston 4 hours ago | parent | prev [-]

clone, pull, push, branch, merge, add, commit are the ones I use, but that's 7

	▲	3 hours ago \| parent \| next [-]
		[deleted]
	▲	xboxnolifes 2 hours ago \| parent \| prev [-]
		checkout, log, config?

▲

pushcx 5 hours ago | parent | prev [-]

I had wanted the same thing for a long time and jj + difftastic has satisfied me.