History

Commits on ig/commit-debug to cli/tests1505+

cli: make `jj workspace add` preserve all parents of current workspaceMartin von Zweigbergk committed 3 years ago23a0bab
immutable commits: remove the hint if trying to edit the root commitIlya Grigoriev committed 3 years agob482898
cli new: have `--before/--after` respect immutable commitsIlya Grigoriev committed 3 years agoebb6b94
clippy: run `cargo clippy --fix --workspace` with recent nightlyIlya Grigoriev committed 3 years ago2571169
templater: add local/remote_branches keywordsYuya Nishihara committed 3 years ago0e14a1f
templater: make branches, tags, git_refs, and git_head return list typeYuya Nishihara committed 3 years ago01d4745
cli change id templates: make "hidden" override "divergent"Ilya Grigoriev committed 3 years agoeeb93cc
cli templates: include info on divergent change ids in short commit templateIlya Grigoriev committed 3 years ago1733ae2
cli: rebase descendants earlier for `jj diffedit` and `jj restore`Ilya Grigoriev committed 3 years ago6a128f5
tests: migrate most tests from test_templater.rsYuya Nishihara committed 3 years ago2874a69
tests: use color formatter in core template testsYuya Nishihara committed 3 years ago957360d
tests: add minimal template language and test helpersYuya Nishihara committed 3 years ago96f8ca5
tests: move test_templater_branches() to test_commit_template.rsYuya Nishihara committed 3 years agob455335
cli: add string pattern support to "git push --branch"Yuya Nishihara committed 3 years ago1bfe5b5
cli templates: include hidden (AKA abandoned) status in short commit templateIlya Grigoriev committed 3 years ago5e40798
test_abandon_command: add test where a commit is abandoned twiceIlya Grigoriev committed 3 years ago94c55d6
cli: parse "git fetch --branch" parameter as string patternYuya Nishihara committed 3 years ago560b635
merge: materialize conflicts in executable files like regular filesMartin von Zweigbergk committed 3 years ago8157d4f
cli: add a `jj debug tree` command for printing the treeMartin von Zweigbergk committed 3 years agodaa2317
refs: merge tracking state of remote branchesYuya Nishihara committed 3 years ago5543f7a
cli: show stats if multiple branches are tracked/untrackedYuya Nishihara committed 3 years agobaef7f1
cli: allow to select branches to track/untrack by string patternYuya Nishihara committed 3 years agod7f504c
cli: do not error out on re-track/untrack, show warning insteadYuya Nishihara committed 3 years agod43704c
cli: deprecate branch delete/forget --glob option in favor of glob: syntaxYuya Nishihara committed 3 years ago8dbe12d
cli: add kind:pattern syntax to branch delete/forget commandsYuya Nishihara committed 3 years agoc3f167e
cli: use StringPattern to find branches to delete/forgetYuya Nishihara committed 3 years agoeb2f278
cli: do not list non-tracking remote branches by defaultYuya Nishihara committed 3 years agod92be66
cli: add "branch list --all" option to include all remote branchesYuya Nishihara committed 3 years ago12b879d
git: add `.jj/.gitignore` when creating colocated repoMartin von Zweigbergk committed 3 years ago872265a
templater: take non-tracking remote branches as unrelated to local branchYuya Nishihara committed 3 years agobcf159c
cli: show hints for branches rejected to pushYuya Nishihara committed 3 years agoeb78ae9
refs: error out push if non-tracking remote branches existYuya Nishihara committed 3 years ago9e0b9e6
refs: classify push action based on tracking targetYuya Nishihara committed 3 years ago089503a
git: on push, update jj's view of remote branches without using import_refs()Yuya Nishihara committed 3 years agoe0965c4
git: prohibit push to remote named "git"Yuya Nishihara committed 3 years agoc8a848d