Merge branch 'jb/am-include'

Junio C Hamano committed over 14 years ago

Merge branch 'jc/fmt-merge-msg-people'

Junio C Hamano committed over 14 years ago

t9300-fast-import: avoid 'exit' in test_expect_success snippets

Johannes Sixt committed over 14 years ago

sequencer: remove additional blank line

Ralf Thielow committed over 14 years ago

t9400: fix gnuism in grep

Junio C Hamano committed over 14 years ago

git-gui: preserve commit messages in utf-8

Pat Thoyts committed over 14 years ago

fmt-merge-msg: discard needless merge parents

Junio C Hamano committed over 14 years ago

gc: use argv-array for sub-commands

Jeff King committed over 14 years ago

argv-array: add a new "pushl" method

Jeff King committed over 14 years ago

argv-array: refactor empty_argv initialization

Jeff King committed over 14 years ago

Prevent graph_width of stat width from falling below min

Lucian Poston committed over 14 years ago

t4052: Test diff-stat output with minimum columns

Lucian Poston committed over 14 years ago

git-sh-setup.sh: Add an pwd() function for MinGW

Ramsay Jones committed over 14 years ago

git-submodule.sh: Don't use $path variable in eval_gettext string

Ramsay Jones committed over 14 years ago

compat/mingw.h: Set S_ISUID to prevent a fast-import test failure

Ramsay Jones committed over 14 years ago

builtin/merge.c: reduce parents early

Junio C Hamano committed over 14 years ago

builtin/merge.c: collect other parents early

Junio C Hamano committed over 14 years ago

builtin/merge.c: remove "remoteheads" global variable

Junio C Hamano committed over 14 years ago

merge tests: octopus with redundant parents

Michał Kiedrowicz committed over 14 years ago

mergesort: rename it to llist_mergesort()

Junio C Hamano committed over 14 years ago