simple-ipc: add Unix domain socket implementation
Jeff Hostetler committed over 5 years ago
diff --no-index tests: add test for --exit-code
Ævar Arnfjörð Bjarmason committed over 5 years ago
transport: also free remote_refs in transport_disconnect()
Andrzej Hunt committed over 5 years ago
parse-options: don't leak alias help messages
Andrzej Hunt committed over 5 years ago
parse-options: convert bitfield values to use binary shift
Andrzej Hunt committed over 5 years ago
tree.h API: simplify read_tree_recursive() signature
Ævar Arnfjörð Bjarmason committed over 5 years ago
tree.h API: expose read_tree_1() as read_tree_at()
Ævar Arnfjörð Bjarmason committed over 5 years ago
archive: stop passing "stage" through read_tree_recursive()
Ævar Arnfjörð Bjarmason committed over 5 years ago
ls-files: refactor away read_tree()
Ævar Arnfjörð Bjarmason committed over 5 years ago
ls-files: don't needlessly pass around stage variable
Ævar Arnfjörð Bjarmason committed over 5 years ago
tree.c API: move read_tree() into builtin/ls-files.c
Ævar Arnfjörð Bjarmason committed over 5 years ago
ls-files tests: add meaningful --with-tree tests
Ævar Arnfjörð Bjarmason committed over 5 years ago
show tests: add test for "git show <tree>"
Ævar Arnfjörð Bjarmason committed over 5 years ago
Add testing with merge-ort merge strategy
Elijah Newren committed over 5 years ago
t6423: mark remaining expected failure under merge-ort as such
Elijah Newren committed over 5 years ago
Revert "merge-ort: ignore the directory rename split conflict for now"
Elijah Newren committed over 5 years ago
merge-recursive: add a bunch of FIXME comments documenting known bugs
Elijah Newren committed over 5 years ago
merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
Elijah Newren committed over 5 years ago
t: mark several submodule merging tests as fixed under merge-ort
Elijah Newren committed over 5 years ago
merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
Elijah Newren committed over 5 years ago