color: allow multiple attributes

Junio C Hamano committed over 16 years ago

Sync with 1.7.0.2

Junio C Hamano committed over 16 years ago

Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*

Mark Lodato committed over 16 years ago

Git 1.7.0.2

Junio C Hamano committed over 16 years ago

unset GREP_OPTIONS in test-lib.sh

Bert Wesarg committed almost 17 years ago

Dying in an async procedure should only exit the thread, not the process.

Johannes Sixt committed over 16 years ago

Reimplement async procedures using pthreads

Johannes Sixt committed over 16 years ago

Windows: more pthreads functions

Johannes Sixt committed over 16 years ago

Fix signature of fcntl() compatibility dummy

Johannes Sixt committed over 16 years ago

Make report() from usage.c public as vreportf() and use it.

Johannes Sixt committed over 16 years ago

Modernize t5530-upload-pack-error.

Johannes Sixt committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

Documentation: describe new cherry-pick --ff option

Christian Couder committed over 16 years ago

cherry-pick: add tests for new --ff option

Christian Couder committed over 16 years ago

revert: add --ff option to allow fast forward when cherry-picking

Junio C Hamano committed over 16 years ago

builtin/merge: make checkout_fast_forward() non static

Junio C Hamano committed over 16 years ago

parse-options: add parse_options_concat() to concat options

Junio C Hamano committed over 16 years ago

t3417: Add test cases for "rebase --whitespace=fix"

Björn Gustavsson committed over 16 years ago

t4124: Add additional tests of --whitespace=fix

Björn Gustavsson committed over 16 years ago

apply: Allow blank context lines to match beyond EOF

Björn Gustavsson committed over 16 years ago