Merge branch 'jc/diff-no-index-d-f'

Junio C Hamano committed over 11 years ago

Merge branch 'bc/object-id'

Junio C Hamano committed over 11 years ago

git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array

Elia Pinto committed over 11 years ago

daemon: unbreak NO_IPV6 build regression

Junio C Hamano committed over 11 years ago

prefix_path(): unconditionally free results in the callers

Stefan Beller committed over 11 years ago

write_sha1_file(): do not use a separate sha1[] array

Junio C Hamano committed over 11 years ago

t1007: add hash-object --literally tests

Eric Sunshine committed over 11 years ago

hash-object --literally: fix buffer overrun with extra-long object type

Eric Sunshine committed over 11 years ago

config: use error() instead of fprintf(stderr, ...)

Jonathan Nieder committed over 11 years ago

git-hash-object.txt: document --literally option

Eric Sunshine committed over 11 years ago

blame, log: format usage strings similarly to those in documentation

Alex Henrie committed over 11 years ago

completion: fix and update 'git log --decorate=' options

SZEDER Gábor committed over 11 years ago

completion: remove redundant __git_compute_all_commands() call

SZEDER Gábor committed over 11 years ago

remote.c: drop default_remote_name variable

Jeff King committed over 11 years ago

pathspec: avoid the need of "--" when wildcard is used

Duy Nguyen committed over 11 years ago

blame: CRLF in the working tree and LF in the repo

Torsten Bögershausen committed over 11 years ago

gitk: Fix error when changing colors after closing "List references" window

Paul Mackerras committed over 11 years ago

gitk: Replace catch {unset foo} with unset -nocomplain foo

Paul Mackerras committed over 11 years ago

git-gui: sort entries in tclIndex

Olaf Hering committed over 11 years ago

Git 2.4

Junio C Hamano committed over 11 years ago