git-merge-file --ours, --theirs

Junio C Hamano committed over 18 years ago

Merge remote branch 'ko/master' into HEAD

Junio C Hamano committed almost 17 years ago

t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH

Matthew Ogilvie committed almost 17 years ago

t3409 t4107 t7406 t9150: use dashless commands

Matthew Ogilvie committed almost 17 years ago

builtin-merge.c: call exclude_cmds() correctly.

Avery Pennarun committed almost 17 years ago

t2300: use documented technique to invoke git-sh-setup

Matthew Ogilvie committed almost 17 years ago

prepare send-email for smoother change of --chain-reply-to default

Nanako Shiraishi committed almost 17 years ago

Update draft release notes to 1.6.6 before merging topics for -rc1

Junio C Hamano committed almost 17 years ago

Makefile: do not clean arm directory

Jonathan Nieder committed almost 17 years ago

Give the hunk comment its own color

Bert Wesarg committed almost 17 years ago

send-email: automatic envelope sender

Felipe Contreras committed almost 17 years ago

Add an option for using any HTTP authentication scheme, not only basic

Martin Storsjö committed almost 17 years ago

http: maintain curl sessions

Tay Ray Chuan committed almost 17 years ago

emit_line(): don't emit an empty <SET><RESET> followed by a newline

Junio C Hamano committed almost 17 years ago

t7508-status.sh: Add tests for status -s

Michael J Gruber committed almost 17 years ago

Remove dead code from "git am"

Junio C Hamano committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Add a notice that only certain functions can print color escape codes

Johannes Sixt committed almost 17 years ago

format-patch: add test for parsing of "--"

Felipe Contreras committed almost 17 years ago

format-patch: fix parsing of "--" on the command line

Felipe Contreras committed almost 17 years ago