notes-merge: convert notes_merge* to struct object_id

Brandon Williams committed over 9 years ago

perf: work around the tested repo having an index.lock

Ævar Arnfjörð Bjarmason committed over 9 years ago

Sync with v2.13.1

Junio C Hamano committed over 9 years ago

Seventh batch for 2.14

Junio C Hamano committed over 9 years ago

Merge branch 'ad/pull-remote-doc'

Junio C Hamano committed over 9 years ago

Merge branch 'tb/pull-ff-rebase-autostash'

Junio C Hamano committed over 9 years ago

Merge branch 'jk/drop-free-refspecs'

Junio C Hamano committed over 9 years ago

Merge branch 'jk/connect-symref-info-leak-fix'

Junio C Hamano committed over 9 years ago

Merge branch 'js/blame-lib'

Junio C Hamano committed over 9 years ago

Merge branch 'mh/packed-ref-store-prep'

Junio C Hamano committed over 9 years ago

Merge branch 'mb/diff-default-to-indent-heuristics'

Junio C Hamano committed over 9 years ago

Merge branch 'jh/close-index-before-stat'

Junio C Hamano committed over 9 years ago

Git 2.13.1

Junio C Hamano committed over 9 years ago

Merge branch 'ah/doc-rev-parse-short-default' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'ah/doc-filter-branch-export-env' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'sd/t3200-typofix' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'sb/t5531-update-desc' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'ah/doc-pretty-format-fix' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'ah/doc-interpret-trailers-ifexists' into maint

Junio C Hamano committed over 9 years ago

Merge branch 'ab/ref-filter-no-contains' into maint

Junio C Hamano committed over 9 years ago