Junio C Hamano 0e758ac5a8 Merge branch 'js/difftool-builtin' ...

"git difftool --dir-diff" used to die a controlled death giving a
"fatal" message when encountering a locally modified symbolic link,
but it started segfaulting since v2.12.  This has been fixed.

* js/difftool-builtin:
  difftool: handle modified symlinks in dir-diff mode
  t7800: cleanup cruft left behind by tests
  t7800: remove whitespace before redirect

2017-03-20 13:56:00 -07:00

..

add.c

…

am.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'rs/blame-code-cleanup'

2017-03-17 13:50:24 -07:00

branch.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

…

clean.c

…

clone.c

…

column.c

…

commit-tree.c

…

commit.c

…

config.c

…

count-objects.c

…

credential.c

…

describe.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

diff.c

…

difftool.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

Merge branch 'cc/split-index-config'

2017-03-17 13:50:23 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

interpret-trailers.c

…

log.c

…

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

pack-objects.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

…

push.c

…

read-tree.c

…

rebase--helper.c

…

receive-pack.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

…

replace.c

Merge branch 'bc/object-id'

2017-03-17 13:50:25 -07:00

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'jk/cherry-pick-0-mainline'

2017-03-17 13:50:28 -07:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

submodule--helper.c

…

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

…

write-tree.c

…