Johannes Schindelin committed almost 8 years ago
range-diff: fix regression in passing along diff options
Ævar Arnfjörð Bjarmason committed almost 8 years ago
range-diff doc: add a section about output stability
Ævar Arnfjörð Bjarmason committed almost 8 years ago
l10n: Update Catalan translation
Jordi Mas committed almost 8 years ago
http: add support selecting http version
Force Charlie committed almost 8 years ago
Makefile: ease dynamic-gettext-poison transition
Junio C Hamano committed almost 8 years ago
i18n: make GETTEXT_POISON a runtime option
Ævar Arnfjörð Bjarmason committed almost 8 years ago
merge-recursive: combine error handling
Derrick Stolee committed almost 8 years ago
t6036, t6043: increase code coverage for file collision handling
Elijah Newren committed almost 8 years ago
merge-recursive: improve rename/rename(1to2)/add[/add] handling
Elijah Newren committed almost 8 years ago
merge-recursive: use handle_file_collision for add/add conflicts
Elijah Newren committed almost 8 years ago
merge-recursive: improve handling for rename/rename(2to1) conflicts
Elijah Newren committed almost 8 years ago
merge-recursive: fix rename/add conflict handling
Elijah Newren committed almost 8 years ago
merge-recursive: new function for better colliding conflict resolutions
Elijah Newren committed almost 8 years ago
merge-recursive: increase marker length with depth of recursion
Elijah Newren committed almost 8 years ago
t6036, t6042: testcases for rename collision of already conflicting files
Elijah Newren committed almost 8 years ago
t6042: add tests for consistency in file collision conflict handling
Elijah Newren committed almost 8 years ago
built-in rebase --autostash: leave the current branch alone if possible
Johannes Schindelin committed almost 8 years ago
built-in rebase: demonstrate regression with --autostash
Johannes Schindelin committed almost 8 years ago
Windows: force-recompile git.res for differing architectures
Johannes Schindelin committed almost 8 years ago