am --abort: revert changes introduced by failed 3way merge

Paul Tan committed over 11 years ago

am --skip: support skipping while on unborn branch

Paul Tan committed over 11 years ago

am -3: support 3way merge on unborn branch

Paul Tan committed over 11 years ago

am --skip: revert changes introduced by failed 3way merge

Paul Tan committed over 11 years ago

t4150: test applying StGit patch

Paul Tan committed over 11 years ago

fsck: report errors if reflog entries point at invalid objects

Michael Haggerty committed over 11 years ago

fsck_handle_reflog_sha1(): new function

Michael Haggerty committed over 11 years ago

read_loose_refs(): treat NULL_SHA1 loose references as broken

Michael Haggerty committed over 11 years ago

read-cache: fix untracked cache invalidation when split-index is used

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

git-p4: test with limited p4 server results

Luke Diamand committed over 11 years ago

git-p4: additional testing of --changes-block-size

Luke Diamand committed over 11 years ago

completion: teach 'scissors' mode to 'git commit --cleanup='

SZEDER Gábor committed over 11 years ago

utf8: NO_ICONV: silence uninitialized variable warning

Eric Sunshine committed over 11 years ago

lockfile: wait using sleep_millisec() instead of select()

Johannes Sixt committed over 11 years ago

lockfile: convert retry timeout computations to millisecond

Johannes Sixt committed over 11 years ago

help.c: wrap wait-only poll() invocation in sleep_millisec()

Johannes Sixt committed over 11 years ago

lockfile: replace random() by rand()

Johannes Sixt committed over 11 years ago

Sync with 2.4.3

Junio C Hamano committed over 11 years ago

Git 2.4.3

Junio C Hamano committed over 11 years ago

The first half of the seventh batch for 2.5

Junio C Hamano committed over 11 years ago