Merge branch 'jc/diff-test' into th/diff

Junio C Hamano committed over 20 years ago

Fix diff-tree -s

Timo Hirvonen committed over 20 years ago

log --raw: Don't descend into subdirectories by default

Timo Hirvonen committed over 20 years ago

diff-tree: Use ---\n as a message separator

Timo Hirvonen committed over 20 years ago

Print empty line between raw, stat, summary and patch

Timo Hirvonen committed over 20 years ago

Fix expr usage for FreeBSD

Dennis Stosberg committed over 20 years ago

t4014: fix for whitespace from "wc -l"

Johannes Schindelin committed over 20 years ago

t4013: add more tests around -c and --cc

Junio C Hamano committed over 20 years ago

t4014: add format-patch --ignore-if-in-upstream test

Junio C Hamano committed over 20 years ago

whatchanged: Default to DIFF_FORMAT_RAW

Timo Hirvonen committed over 20 years ago

Don't xcalloc() struct diffstat_t

Timo Hirvonen committed over 20 years ago

Add msg_sep to diff_options

Timo Hirvonen committed over 20 years ago

DIFF_FORMAT_RAW is not default anymore

Timo Hirvonen committed over 20 years ago

Set default diff output format after parsing command line

Timo Hirvonen committed over 20 years ago

Make --raw option available for all diff commands

Timo Hirvonen committed over 20 years ago

format-patch: introduce "--ignore-if-in-upstream"

Johannes Schindelin committed over 20 years ago

add diff_flush_patch_id() to calculate the patch id

Johannes Schindelin committed over 20 years ago

t4013: add tests for diff/log family output options.

Junio C Hamano committed over 20 years ago

Merge branch 'jc/squash'

Junio C Hamano committed over 20 years ago

← Newer Page 3832 of 4102 Older →