Merge branch 'tb/blame-resurrect-convert-to-git' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jc/plug-fmt-merge-msg-leak' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'pt/xdg-config-path' into maint

Junio C Hamano committed over 11 years ago

ll-merge: pass the original path to external drivers

Junio C Hamano committed over 11 years ago

git-am: add am.threeWay config variable

Remi Lespinet committed over 11 years ago

t4150-am: refactor am -3 tests

Remi Lespinet committed over 11 years ago

git-am.sh: fix initialization of the threeway variable

Remi Lespinet committed over 11 years ago

index-pack: fix truncation of off_t in comparison

Jeff King committed over 11 years ago

read_loose_refs(): simplify function logic

Michael Haggerty committed over 11 years ago

configure: add getdelim() check

Eric Sunshine committed over 11 years ago

config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

Eric Sunshine committed over 11 years ago

ewah: use less generic macro name

Jeff King committed over 11 years ago

ewah/bitmap: silence warning about MASK macro redefinition

Eric Sunshine committed over 11 years ago

Documentation/technical/pack-protocol: mention http as possible protocol

Stefan Beller committed over 11 years ago

pull: use git-rev-parse --parseopt for option parsing

Paul Tan committed over 11 years ago

pull: handle git-fetch's options as well

Paul Tan committed over 11 years ago

Merge branch 'pt/pull-tests' into pt/pull-optparse

Junio C Hamano committed over 11 years ago

for-each-ref: report broken references correctly

Michael Haggerty committed over 11 years ago

t6301: new tests of for-each-ref error handling

Michael Haggerty committed over 11 years ago

format-patch: do not feed tags to clear_commit_marks()

Junio C Hamano committed over 11 years ago