Git 2.2.0-rc3

Junio C Hamano committed almost 12 years ago

mergetools: stop setting $status in merge_cmd()

David Aguilar committed almost 12 years ago

mergetool: simplify conditionals

David Aguilar committed almost 12 years ago

difftool--helper: add explicit exit statement

David Aguilar committed almost 12 years ago

mergetool--lib: remove use of $status global

David Aguilar committed almost 12 years ago

mergetool--lib: remove no-op assignment to $status from setup_user_tool

Junio C Hamano committed almost 12 years ago

init-db: improve the filemode trustability check

Torsten Bögershausen committed almost 12 years ago

add: ignore only ignored files

Michael J Gruber committed almost 12 years ago

diff-highlight: allow configurable colors

Jeff King committed almost 12 years ago

parse_color: recognize "no$foo" to clear the $foo attribute

Jeff King committed almost 12 years ago

parse_color: support 24-bit RGB values

Jeff King committed almost 12 years ago

parse_color: refactor color storage

Jeff King committed almost 12 years ago

Merge branch 'jn/parse-config-slot' into jk/colors

Junio C Hamano committed almost 12 years ago

t4026: test "normal" color

Jeff King committed almost 12 years ago

config: fix parsing of "git config --get-color some.key -1"

Jeff King committed almost 12 years ago

docs: describe ANSI 256-color mode

Jeff King committed almost 12 years ago

lock_ref_sha1_basic: do not die on locking errors

Ronnie Sahlberg committed almost 12 years ago

l10n: remove a superfluous translation for push.c

Jiang Xin committed almost 12 years ago

l10n: de.po: translate 2 messages

Ralf Thielow committed almost 12 years ago

l10n: de.po: translate 2 new messages

Ralf Thielow committed almost 12 years ago