Merge branch 'lr/git-run-setup-gently'

Junio C Hamano committed over 12 years ago

Merge branch 'fc/mergetools-vimdiff3'

Junio C Hamano committed over 12 years ago

Merge branch 'fc/merge-default-to-upstream'

Junio C Hamano committed over 12 years ago

Merge branch 'jk/external-diff-use-argv-array'

Junio C Hamano committed over 12 years ago

Merge branch 'sk/svn-parse-datestamp'

Junio C Hamano committed over 12 years ago

Merge branch 'rs/ref-update-check-errors-early'

Junio C Hamano committed over 12 years ago

Merge branch 'nd/index-pack-one-fd-per-thread'

Junio C Hamano committed over 12 years ago

Merge branch 'ym/fix-opportunistic-index-update-race'

Junio C Hamano committed over 12 years ago

Merge branch 'mh/ref-transaction'

Junio C Hamano committed over 12 years ago

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