Merge branch 'maint'

Junio C Hamano committed over 12 years ago

Update draft release notes to 1.9.2

Junio C Hamano committed over 12 years ago

Merge branch 'mm/status-porcelain-format-i18n-fix' into maint

Junio C Hamano committed over 12 years ago

Merge branch 'bp/commit-p-editor' into maint

Junio C Hamano committed over 12 years ago

Merge branch 'jk/pack-bitmap'

Junio C Hamano committed over 12 years ago

Merge branch 'jl/nor-or-nand-and'

Junio C Hamano committed over 12 years ago

Merge branch 'mh/update-ref-batch-create-fix'

Junio C Hamano committed over 12 years ago

Merge branch 'mr/opt-set-ptr'

Junio C Hamano committed over 12 years ago

Merge branch 'ib/rev-parse-parseopt-argh'

Junio C Hamano committed over 12 years ago

Merge branch 'mr/msvc-link-with-invalidcontinue'

Junio C Hamano committed over 12 years ago

Merge branch 'jc/rev-parse-argh-dashed-multi-words'

Junio C Hamano committed over 12 years ago

Merge branch 'jk/commit-dates-parsing-fix'

Junio C Hamano committed over 12 years ago

git-p4: explicitly specify that HEAD is a revision

Vlad Dogaru committed over 12 years ago

combine-diff: speed it up, by using multiparent diff tree-walker directly

Kirill Smelkov committed over 12 years ago

tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

Kirill Smelkov committed over 12 years ago

ref_transaction_commit(): work with transaction->updates in place

Michael Haggerty committed over 12 years ago

struct ref_update: add a type field

Michael Haggerty committed over 12 years ago

struct ref_update: add a lock field

Michael Haggerty committed over 12 years ago

ref_transaction_commit(): simplify code using temporary variables

Michael Haggerty committed over 12 years ago

struct ref_update: store refname as a FLEX_ARRAY

Michael Haggerty committed over 12 years ago