Merge branch 'en/merge-trivial-fix'

Junio C Hamano committed over 10 years ago

Merge branch 'en/merge-octopus-fix'

Junio C Hamano committed over 10 years ago

Merge branch 'dt/pre-refs-backend'

Junio C Hamano committed over 10 years ago

Merge branch 'jc/rerere-multi'

Junio C Hamano committed over 10 years ago

difftool/mergetool: make the form of yes/no questions consistent

Nikola Forró committed over 10 years ago

match-trees: convert several leaf functions to use struct object_id

brian m. carlson committed over 10 years ago

tree-walk: convert tree_entry_extract() to use struct object_id

brian m. carlson committed over 10 years ago

struct name_entry: use struct object_id instead of unsigned char sha1[20]

brian m. carlson committed over 10 years ago

Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint

Junio C Hamano committed over 10 years ago

send-email: fix grammo in the prompt that asks e-mail recipients

Junio C Hamano committed over 10 years ago

convert.c: ident + core.autocrlf didn't work

Torsten Bögershausen committed over 10 years ago

t0027: test cases for combined attributes

Torsten Bögershausen committed over 10 years ago

convert: allow core.autocrlf=input and core.eol=crlf

Torsten Bögershausen committed over 10 years ago

t0027: make commit_chk_wrnNNO() reliable

Torsten Bögershausen committed over 10 years ago

string_list: use string-list API in unsorted_string_list_lookup()

Ralf Thielow committed over 10 years ago

t9824: fix broken &&-chain in a subshell

SZEDER Gábor committed over 10 years ago

git-rebase--merge: don't include absent parent as a base

Ben Woosley committed over 10 years ago

Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint

Jiang Xin committed over 10 years ago

Sixth batch for post 2.8 cycle

Junio C Hamano committed over 10 years ago

Merge branch 'ad/cygwin-wants-rename'

Junio C Hamano committed over 10 years ago