Merge branch 'jc/everyday-markup'

Junio C Hamano committed almost 11 years ago

Merge branch 'xf/user-manual-markup'

Junio C Hamano committed almost 11 years ago

difftool: ignore symbolic links in use_wt_file

David Aguilar committed almost 11 years ago

merge-file: clamp exit code to maximum 127

Jeff King committed almost 11 years ago

rebase-i: work around Windows CRLF line endings

Junio C Hamano committed almost 11 years ago

t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings

Johannes Schindelin committed almost 11 years ago

add_submodule_odb: initialize alt_odb list earlier

Jeff King committed almost 11 years ago

Seventh batch for 2.7

Junio C Hamano committed almost 11 years ago

Merge branch 'dk/p4-import-ctypes'

Junio C Hamano committed almost 11 years ago

Merge branch 'jk/repository-extension'

Junio C Hamano committed almost 11 years ago

Merge branch 'dt/t7063-fix-flaky-test'

Junio C Hamano committed almost 11 years ago

Merge branch 'kn/for-each-tag'

Junio C Hamano committed almost 11 years ago

Merge branch 'es/worktree-add'

Junio C Hamano committed almost 11 years ago

Merge branch 'tk/stripspace'

Junio C Hamano committed almost 11 years ago

Merge branch 'rt/placeholder-in-usage'

Junio C Hamano committed almost 11 years ago

Merge branch 'jc/usage-stdin'

Junio C Hamano committed almost 11 years ago

Merge branch 'mr/worktree-list'

Junio C Hamano committed almost 11 years ago

Merge branch 'jc/am-3-fallback-regression-fix'

Junio C Hamano committed almost 11 years ago

merge: detect delete/modechange conflict

Jeff King committed almost 11 years ago

t6031: generalize for recursive and resolve strategies

Jeff King committed almost 11 years ago