t6416, t6422: fix incorrect untracked file count

Elijah Newren committed about 6 years ago

t6422: fix bad check against missing file

Elijah Newren committed about 6 years ago

t6418: tighten delete/normalize conflict testcase

Elijah Newren committed about 6 years ago

Collect merge-related tests to t64xx

Elijah Newren committed about 6 years ago

progress: don't dereference before checking for NULL

Martin Ågren committed about 6 years ago

Fifth batch

Junio C Hamano committed about 6 years ago

Merge branch 'pb/guide-docs'

Junio C Hamano committed about 6 years ago

Merge branch 'so/rev-parser-errormessage-fix'

Junio C Hamano committed about 6 years ago

Merge branch 'en/eol-attrs-gotchas'

Junio C Hamano committed about 6 years ago

Merge branch 'jk/compiler-fixes-and-workarounds'

Junio C Hamano committed about 6 years ago

Merge branch 'ny/notes-doc-sample-update'

Junio C Hamano committed about 6 years ago

Merge branch 'es/adjust-subtree-test-for-merge-msg-update'

Junio C Hamano committed about 6 years ago

Merge branch 'rs/bisect-oid-to-hex-fix'

Junio C Hamano committed about 6 years ago

Merge branch 'en/merge-recursive-comment-fixes'

Junio C Hamano committed about 6 years ago

Merge branch 'ma/t1450-quotefix'

Junio C Hamano committed about 6 years ago

Merge branch 'es/worktree-cleanup'

Junio C Hamano committed about 6 years ago

Merge branch 'jk/strvec'

Junio C Hamano committed about 6 years ago

init: disallow --separate-git-dir with bare repository

Eric Sunshine committed about 6 years ago

test_cmp: diagnose incorrect arguments

Eric Sunshine committed about 6 years ago

diff-lib: use worktree mode in diffs from i-t-a entries

Raymond E. Pasco committed about 6 years ago