Merge branch 'master' of https://github.com/vnwildman/git

Jiang Xin committed over 9 years ago

read-cache: close index.lock in do_write_index

Jeff Hostetler committed over 9 years ago

status: add color config slots for branch info in "--short --branch"

Stephen Kent committed over 9 years ago

status: fix missing newline when comment chars are disabled

Jeff King committed over 9 years ago

archive-zip: set version field for big files correctly

René Scharfe committed over 9 years ago

am: shorten ident_split variable name in get_commit_info()

Jeff King committed over 9 years ago

am: simplify allocations in get_commit_info()

Jeff King committed over 9 years ago

am: fix commit buffer leak in get_commit_info()

Jeff King committed over 9 years ago

use uintmax_t for timestamps

Johannes Schindelin committed over 9 years ago

date.c: abort if the system time cannot handle one of our timestamps

Johannes Schindelin committed over 9 years ago

timestamp_t: a new data type for timestamps

Johannes Schindelin committed over 9 years ago

rebase -i: reread the todo list if `exec` touched it

Stephen Hicks committed over 9 years ago

travis-ci: set DEVELOPER knob for Linux32 build

Lars Schneider committed over 9 years ago

travis-ci: printf $STATUS as string

Lars Schneider committed over 9 years ago

travis-ci: check AsciiDoc/AsciiDoctor stderr output

Lars Schneider committed over 9 years ago

sequencer: add newline before adding footers

Jonathan Tan committed over 9 years ago

t1450: avoid use of "sed" on the index, which is a binary file

Jeff Hostetler committed over 9 years ago

repack: accept --threads=<n> and pass it down to pack-objects

Junio C Hamano committed over 9 years ago

Git 2.13-rc1

Junio C Hamano committed over 9 years ago

Merge branch 'mh/separate-ref-cache'

Junio C Hamano committed over 9 years ago