Merge branch 'ks/tree-diff-nway'

Junio C Hamano committed over 12 years ago

Merge branch 'jc/apply-ignore-whitespace'

Junio C Hamano committed over 12 years ago

Merge branch 'as/grep-fullname-config'

Junio C Hamano committed over 12 years ago

refs.c: change read_ref_at to use the reflog iterators

Ronnie Sahlberg committed over 12 years ago

environment.c: enable core.preloadindex by default

Steve Hoelzer committed over 12 years ago

error_resolve_conflict: drop quotations around operation

Jeff King committed over 12 years ago

error_resolve_conflict: rewrap advice message

Jeff King committed over 12 years ago

dir.c:trim_trailing_spaces(): fix for " \ " sequence

Pasha Bolokhov committed over 12 years ago

pack-objects: use free()+xcalloc() instead of xrealloc()+memset()

René Scharfe committed over 12 years ago

mailinfo: use strcmp() for string comparison

René Scharfe committed over 12 years ago

fetch doc: remove notes on outdated "mixed layout"

Junio C Hamano committed over 12 years ago

fetch doc: update note on '+' in front of the refspec

Junio C Hamano committed over 12 years ago

fetch doc: move FETCH_HEAD material lower and add an example

Marc Branchaud committed over 12 years ago

fix brown paper bag breakage in t5150-request-pull.sh

Johannes Sixt committed over 12 years ago

sideband.c: do not use ANSI control sequence on non-terminal

Michael Naumov committed over 12 years ago

git log: support "auto" decorations

Linus Torvalds committed over 12 years ago

compat/bswap.h: fix endianness detection

Ben Walton committed over 12 years ago

t5538: move http push tests out to t5542

Nick Alcock committed over 12 years ago

fetch doc: update introductory part for clarity

Junio C Hamano committed over 12 years ago

Sync with 1.9.4

Junio C Hamano committed over 12 years ago