Merge branch 'tb/delimit-pretty-trailers-args-with-comma'

Junio C Hamano committed almost 9 years ago

completion: add --broken and --dirty to describe

Thomas Braun committed almost 9 years ago

tests: fix diff order arguments in test_cmp

Stefan Beller committed almost 9 years ago

refs_resolve_ref_unsafe: handle d/f conflicts for writes

Jeff King committed almost 9 years ago

t3308: create a real ref directory/file conflict

Jeff King committed almost 9 years ago

read_cache: roll back lock in `update_index_if_able()`

Martin Ågren committed almost 9 years ago

read-cache: leave lock in right state in `write_locked_index()`

Martin Ågren committed almost 9 years ago

read-cache: drop explicit `CLOSE_LOCK`-flag

Martin Ågren committed almost 9 years ago

api-argv-array.txt: remove broken link to string-list API

Todd Zullinger committed almost 9 years ago

entry.c: check if file exists after checkout

Lars Schneider committed almost 9 years ago

bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

Pranit Bauva committed almost 9 years ago

t6030: explicitly test for bisection cleanup

Pranit Bauva committed almost 9 years ago

bisect--helper: `bisect_clean_state` shell function in C

Pranit Bauva committed almost 9 years ago

bisect--helper: `write_terms` shell function in C

Pranit Bauva committed almost 9 years ago

bisect--helper: rewrite `check_term_format` shell function in C

Pranit Bauva committed almost 9 years ago

bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

Pranit Bauva committed almost 9 years ago

sha1_loose_object_info: handle errors from unpack_sha1_rest

Jeff King committed almost 9 years ago

.mailmap: normalize name for René Scharfe

René Scharfe committed almost 9 years ago

fsck: handle NULL return of lookup_blob() and lookup_tree()

René Scharfe committed almost 9 years ago

cache.h: document `write_locked_index()`

Martin Ågren committed almost 9 years ago