Merge branch 'maint-1.6.0' into maint

Junio C Hamano committed almost 18 years ago

avoid 31-bit truncation in write_loose_object

Jeff King committed almost 18 years ago

Simplify t3412

Johannes Schindelin committed almost 18 years ago

Simplify t3411

Johannes Schindelin committed almost 18 years ago

Simplify t3410

Johannes Schindelin committed almost 18 years ago

test-lib.sh: introduce test_commit() and test_merge() helpers

Johannes Schindelin committed almost 18 years ago

lib-rebase.sh: Document what set_fake_editor() does

Johannes Schindelin committed almost 18 years ago

t3404 & t3411: undo copy&paste

Johannes Schindelin committed almost 18 years ago

add -u: do not fail to resolve a path as deleted

Junio C Hamano committed almost 18 years ago

builtin-apply.c: do not set bogus mode in check_preimage() for deleted path

Junio C Hamano committed almost 18 years ago

mailinfo: tests for RFC2047 examples

Kirill Smelkov committed almost 18 years ago

mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'

Kirill Smelkov committed almost 18 years ago

Merge branch 'tr/previous-branch'

Junio C Hamano committed almost 18 years ago

Fix submodule squashing into unrelated commit

Johannes Schindelin committed almost 18 years ago

rebase -i squashes submodule changes into unrelated commit

Junio C Hamano committed almost 18 years ago

gitweb: check if-modified-since for feeds

Giuseppe Bilotta committed almost 18 years ago

gitweb: last-modified time should be commiter, not author

Giuseppe Bilotta committed almost 18 years ago

gitweb: rss channel date

Giuseppe Bilotta committed almost 18 years ago

gitweb: rss feed managingEditor

Giuseppe Bilotta committed almost 18 years ago

gitweb: feed generator metadata

Giuseppe Bilotta committed almost 18 years ago