sha1-lookup: rename `sha1_pos()` as `hash_pos()`

Martin Ågren committed over 5 years ago

object-file.c: rename from sha1-file.c

Martin Ågren committed over 5 years ago

object-name.c: rename from sha1-name.c

Martin Ågren committed over 5 years ago

pack-format.txt: document sizes at start of delta data

Martin Ågren committed over 5 years ago

diffcore-rename: remove unnecessary duplicate entry checks

Elijah Newren committed over 5 years ago

t6016: move to lib-log-graph.sh framework

Antonio Russo committed over 5 years ago

t1300: don't needlessly work with `core.foo` configs

Martin Ågren committed over 5 years ago

t1300: remove duplicate test for `--file no-such-file`

Martin Ågren committed over 5 years ago

t1300: remove duplicate test for `--file ../foo`

Martin Ågren committed over 5 years ago

gitmodules.txt: fix 'GIT_WORK_TREE' variable name

Philippe Blain committed over 5 years ago

doc: fix some typos

Thomas Ackermann committed over 5 years ago

merge-ort: flesh out implementation of handle_content_merge()

Elijah Newren committed over 5 years ago

merge-ort: add handling for different types of files at same path

Elijah Newren committed over 5 years ago

merge-ort: handle book-keeping around two- and three-way content merge

Elijah Newren committed over 5 years ago

merge-ort: copy find_first_merges() implementation from merge-recursive.c

Elijah Newren committed over 5 years ago

merge-ort: implement unique_path() helper

Elijah Newren committed over 5 years ago

merge-ort: implement format_commit()

Elijah Newren committed over 5 years ago

merge-ort: handle directory/file conflicts that remain

Elijah Newren committed over 5 years ago

merge-ort: copy and adapt merge_submodule() from merge-recursive.c

Elijah Newren committed over 5 years ago

merge-ort: handle D/F conflict where directory disappears due to merge

Elijah Newren committed over 5 years ago