History

Commits on ig/commit-debug6230+

cargo: bump the cargo-dependencies group with 1 updatedependabot[bot] committed 3 years agofa75889
git: only try to use ssh-agent once per connectionMartin von Zweigbergk committed 3 years agoc752b43
test_git_push: Test `git.push-branch-prefix` configIlya Grigoriev committed 3 years agoa9e5e97
test_git_push: use -c instead of --change occasionallyIlya Grigoriev committed 3 years agoadd867c
config: Rename `push.branch-prefix` option to `git.push-branch-prefix`Ilya Grigoriev committed 3 years ago74d9970
merge_tools: make dirs readonly for external difftoolIlya Grigoriev committed 3 years ago9e08b52
cargo: move `examples/` into `cli/` so they are part of the build againMartin von Zweigbergk committed 3 years agocc335a9
cargo: bump the cargo-dependencies group with 4 updatesdependabot[bot] committed 3 years ago9bc8ff9
refs: rename RefTarget::as_conflict() to as_merge()Yuya Nishihara committed 3 years ago2619200
conflicts: move `Merge` tests to `merge` moduleMartin von Zweigbergk committed 3 years agob9b285c
merge: move `tests` module to end of fileMartin von Zweigbergk committed 3 years agoaf2dba1
working_copy: add debug assertion that tree and file states matchMartin von Zweigbergk committed 3 years ago14ddd17
working_copy: reduce scope of some variablesMartin von Zweigbergk committed 3 years ago6cce5e7
working_copy: add trace scope to tree-writing callMartin von Zweigbergk committed 3 years ago16d0058
working_copy: split up tracing scope a bitMartin von Zweigbergk committed 3 years agod06f51a
working_copy: rename `deleted_files_tx` to `present_files_tx`Martin von Zweigbergk committed 3 years agob27b686
conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
cargo: unify a lot of crate metadata in the workspaceAustin Seipp committed 3 years agod858db7
cargo: unify dependency versions through workspace depsAustin Seipp committed 3 years ago13fff3b
git: on import_refs(), filter out uninteresting refs earlierYuya Nishihara committed 3 years agoc8f7a5f
git: extract immutable part of import_refs() to separate functionYuya Nishihara committed 3 years agob3ee8a0
git: calculate refs to be imported first, then apply in later passYuya Nishihara committed 3 years agoa2b8d1c
git: on import_refs(), use post-mutation view to collect heads to be pinnedYuya Nishihara committed 3 years agofeaddf6
build: update rerun-if conditions to watch .git/HEAD in colocated repoYuya Nishihara committed 3 years ago5e22e67
build: in cli build script, fix relative path to rootMartin von Zweigbergk committed 3 years agoaae14b2
tests: move `tests/` under `cli/` so they're run againMartin von Zweigbergk committed 3 years ago0075174
gen-protos: specify licenseAustin Seipp committed 3 years agob19bf37
cli: move src/ directory to new cli/ directoryAustin Seipp committed 3 years ago48fa821
tests: another attempt to fix remaining flaky tests in `test_view.rs`Martin von Zweigbergk committed 3 years ago56109bd
backout of commit e212e10deee96878236c12a565d99abcc18d2fcbAustin Seipp committed 3 years ago6880294
tests: attempt to fix more flaky tests in `test_view.rs`Martin von Zweigbergk committed 3 years ago4a10ea4
cargo: bump the cargo-dependencies group with 1 updatedependabot[bot] committed 3 years ago644a7d3
commands: Add `run`.Philip Metzger committed 3 years ago85b66e4
cli: load default diff command from "ui.diff.tool" configYuya Nishihara committed 3 years agob352061