History

Commits on ig/commit-debug5565+

templates: no-op refactor to reduce duplication and simplify next commitIlya Grigoriev committed 3 years agoa91b6d9
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
cargo: bump the cargo-dependencies group with 2 updatesdependabot[bot] committed 3 years agoa3d9c28
merged_tree: propagate backend errors in diff iteratorMartin von Zweigbergk committed 3 years agoa1ef9dc
merge: introduce a type alias for `Merge<Option<TreeValue>>`Martin von Zweigbergk committed 3 years ago309f120
merged_tree: rename `MergedTreeValue` to `MergedTreeVal`Martin von Zweigbergk committed 3 years ago6ad71e6
docs/config.toml: update the default diff editorIlya Grigoriev committed 3 years agob6eb00d
cli: add string pattern support to "git push --branch"Yuya Nishihara committed 3 years ago1bfe5b5
merge_tools.toml: add VS Code as a default merge tool.Ilya Grigoriev committed 3 years agofcd02a6
cargo: bump the cargo-dependencies group with 2 updatesdependabot[bot] committed 3 years agoc56cff5
docs: fix broken Markdown in `github.md`, plus various cleanupsMartin von Zweigbergk committed 3 years ago3a7d210
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
git: simply call fetch() with one or more branch name filtersYuya Nishihara committed 3 years agoa6ac9b4
cli: parse "git fetch --branch" parameter as string patternYuya Nishihara committed 3 years ago560b635
cli: move parse_name_pattern() to cli_util, rename the functionYuya Nishihara committed 3 years ago09529b6
github: bump the github-dependencies group with 1 updatedependabot[bot] committed 3 years ago0319b1c
cargo: bump the cargo-dependencies group with 2 updatesdependabot[bot] committed 3 years ago296f472
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
merge: make non-conflicted debug string for `Merge` shorterMartin von Zweigbergk committed 3 years ago21b11df
git: remove RefName::GitRef variant which isn't used anymoreYuya Nishihara committed 3 years ago831dc84
git: move RefName enum from view moduleYuya Nishihara committed 3 years agoa756333
repo: add merge methods per ref kind, remove RefName indirectionYuya Nishihara committed 3 years ago9591969
git: expand RefName match arms in import_refs()Yuya Nishihara committed 3 years ago6dfe157
repo: inline merge_single_ref() from viewYuya Nishihara committed 3 years agoffe7e5f
refs: merge tracking state of remote branchesYuya Nishihara committed 3 years ago5543f7a
refs: add function to diff RemoteRef pairsYuya Nishihara committed 3 years ago3d45540
refs: rename diff_named_refs() to diff_named_ref_targets()Yuya Nishihara committed 3 years ago6450194
refs: add helper function to iterate local/remote ref pairsYuya Nishihara committed 3 years ago59eb03e
cli: show stats if multiple branches are tracked/untrackedYuya Nishihara committed 3 years agobaef7f1