Merge branch 'ap/rebase-multiple-fixups'

Junio C Hamano committed over 13 years ago

Merge branch 'kb/am-deprecate-resolved'

Junio C Hamano committed over 13 years ago

Merge branch 'rr/column-doc'

Junio C Hamano committed over 13 years ago

Merge branch 'ft/doc-git-transport'

Junio C Hamano committed over 13 years ago

Merge branch 'sb/mailmap-merijn-brand'

Junio C Hamano committed over 13 years ago

Merge branch 'sg/bash-prompt'

Junio C Hamano committed over 13 years ago

Merge branch 'wk/doc-in-linux-3.x-era'

Junio C Hamano committed over 13 years ago

Merge branch 'jc/topo-author-date-sort'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/commit-info-slab'

Junio C Hamano committed over 13 years ago

t4205: replace .\+ with ..* in sed commands

Brian Gernhardt committed over 13 years ago

lib-rebase: style: use write_script, <<-\EOF

Andrew Pimlott committed over 13 years ago

t7500: fix flipped actual/expect

Andrew Pimlott committed over 13 years ago

lib-rebase: document exec_ in FAKE_LINES

Andrew Pimlott committed over 13 years ago

completion: learn about --man-path

John Keeping committed over 13 years ago

completion: handle unstuck form of base git options

John Keeping committed over 13 years ago

Merge branch 'maint'

Junio C Hamano committed over 13 years ago

Update draft release notes to 1.8.4

Junio C Hamano committed over 13 years ago

Merge branch 'mh/ref-races'

Junio C Hamano committed over 13 years ago

Merge branch 'ap/diff-ignore-blank-lines'

Junio C Hamano committed over 13 years ago

Merge branch 'mh/loose-refs-race-with-pack-ref'

Junio C Hamano committed over 13 years ago