Merge branch 'jk/has-uncommitted-changes-fix'

Junio C Hamano committed about 8 years ago

sha1dc: update from upstream

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

score_trees(): fix iteration over trees with missing entries

Jeff King committed about 8 years ago

remote: make refspec follow the same disambiguation rule as local refs

Junio C Hamano committed about 8 years ago

fetch-pack: unify ref in and out param

Jonathan Tan committed about 8 years ago

git-p4: add the `p4-pre-submit` hook

Chen Bin committed about 8 years ago

xdiff: reduce indent heuristic overhead

Stefan Beller committed about 8 years ago

t1300: document current behavior of setting options

Stefan Beller committed about 8 years ago

fetch doc: cross-link two new negotiation options

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

negotiator: unknown fetch.negotiationAlgorithm should error out

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

Merge branch 'jt/fetch-nego-tip' into ab/fetch-nego

Junio C Hamano committed about 8 years ago

t1404: increase core.packedRefsTimeout to avoid occasional test failure

SZEDER Gábor committed about 8 years ago

travis-ci: include the trash directories of failed tests in the trace log

SZEDER Gábor committed about 8 years ago

remote: clear string_list after use in mv()

René Scharfe committed about 8 years ago

read-cache: fix directory/file conflict handling in read_index_unmerged()

Elijah Newren committed about 8 years ago

t1015: demonstrate directory/file conflict recovery failures

Elijah Newren committed about 8 years ago

sequencer: don't die() on bogus user-edited timestamp

Eric Sunshine committed about 8 years ago

sequencer: fix "rebase -i --root" corrupting author header timestamp

Eric Sunshine committed about 8 years ago

sequencer: fix "rebase -i --root" corrupting author header timezone

Eric Sunshine committed about 8 years ago

sequencer: fix "rebase -i --root" corrupting author header

Eric Sunshine committed about 8 years ago