merge: always roll back lock in `checkout_fast_forward()`

Martin Ågren committed over 8 years ago

merge-recursive: always roll back lock in `merge_recursive_generic()`

Martin Ågren committed over 8 years ago

t5536: simplify checking of messages output to stderr

SZEDER Gábor committed over 8 years ago

diff: add --compact-summary

Nguyễn Thái Ngọc Duy committed over 8 years ago

revision.c: reduce object database queries

Derrick Stolee committed over 8 years ago

perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config file

René Scharfe committed over 8 years ago

Git.pm: add the "use warnings" pragma

Ævar Arnfjörð Bjarmason committed over 8 years ago

Git.pm: remove redundant "use strict" from sub-package

Ævar Arnfjörð Bjarmason committed over 8 years ago

perl: *.pm files should not have the executable bit

Ævar Arnfjörð Bjarmason committed over 8 years ago

sequencer: always roll back lock in `do_recursive_merge()`

Martin Ågren committed over 8 years ago

sequencer: make lockfiles non-static

Martin Ågren committed over 8 years ago

sha1_name: fix uninitialized memory errors

Derrick Stolee committed over 8 years ago

docs/pretty-formats: fix typo '% <(<N>)' -> '%<|(<N>)'

Mårten Kongstad committed over 8 years ago

merge-recursive: ensure we write updates for directory-renamed file

Elijah Newren committed over 8 years ago

merge-recursive: avoid spurious rename/rename conflict from dir renames

Elijah Newren committed over 8 years ago

directory rename detection: new testcases showcasing a pair of bugs

Elijah Newren committed over 8 years ago

merge-recursive: fix remaining directory rename + dirty overwrite cases

Elijah Newren committed over 8 years ago

merge-recursive: fix overwriting dirty files involved in renames

Elijah Newren committed over 8 years ago

merge-recursive: avoid clobbering untracked files with directory renames

Elijah Newren committed over 8 years ago

merge-recursive: apply necessary modifications for directory renames

Elijah Newren committed over 8 years ago