Junio C Hamano ef09a7fbbe Merge branch 'da/difftool-dir-diff-symlink-fix' into maint ...

"git difftool --dir-diff" mishandled symbolic links.

* da/difftool-dir-diff-symlink-fix:
  difftool: fix symlink-file writing in dir-diff mode

2021-10-12 13:51:48 -07:00

..

add.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

am.c

am: fix incorrect exit status on am fail to abort

2021-09-10 15:51:15 -07:00

annotate.c

…

apply.c

…

archive.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

bisect--helper.c

…

blame.c

…

branch.c

branch: allow deleting dangling branches with --force

2021-08-27 15:11:18 -07:00

bugreport.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

…

checkout-index.c

…

checkout.c

checkout: make delayed checkout respect --quiet and --no-progress

2021-08-26 23:15:33 -07:00

clean.c

…

clone.c

clone: handle unborn branch in bare repos

2021-09-20 14:05:36 -07:00

column.c

column: fix parsing of the '--nl' option

2021-08-26 14:36:27 -07:00

commit-graph.c

…

commit-tree.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

commit.c

commit: restore --edit when combined with --fixup

2021-08-15 09:44:08 -07:00

config.c

…

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

…

credential.c

…

describe.c

…

diff-files.c

…

diff-index.c

diff-index: restore -c/--cc options handling

2021-09-07 11:11:35 -07:00

diff-tree.c

…

diff.c

Merge branch 'dl/diff-merge-base'

2021-07-28 13:17:59 -07:00

difftool.c

Merge branch 'da/difftool-dir-diff-symlink-fix' into maint

2021-10-12 13:51:48 -07:00

env--helper.c

…

fast-export.c

Merge branch 'tk/fast-export-anonymized-tag-fix' into maint

2021-10-12 13:51:43 -07:00

fast-import.c

…

fetch-pack.c

…

fetch.c

Merge branch 'jt/push-negotiation-fixes' into maint

2021-10-12 13:51:36 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

for-each-repo.c

builtin/for-each-repo: remove unnecessary argv copy to plug leak

2021-07-26 12:19:20 -07:00

fsck.c

…

gc.c

Merge branch 'ab/gc-log-rephrase' into maint

2021-10-12 13:51:30 -07:00

get-tar-commit-id.c

…

grep.c

…

hash-object.c

Merge branch 'jc/prefix-filename-allocates' into maint

2021-10-12 13:51:32 -07:00

help.c

…

index-pack.c

Merge branch 'tb/pack-finalize-ordering' into maint

2021-10-12 13:51:46 -07:00

init-db.c

…

interpret-trailers.c

…

log.c

Merge branch 'jk/log-decorate-optim'

2021-07-28 13:17:58 -07:00

ls-files.c

…

ls-remote.c

ls-remote: set packet_trace_identity(<name>)

2021-08-24 14:47:07 -07:00

ls-tree.c

…

mailinfo.c

…

mailsplit.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'en/pull-conflicting-options' into maint

2021-10-12 13:51:36 -07:00

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv

2021-07-26 12:19:20 -07:00

name-rev.c

…

notes.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

pack-objects.c

Merge branch 'tb/pack-finalize-ordering' into maint

2021-10-12 13:51:46 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

pull: fix handling of multiple heads

2021-07-22 11:54:30 -07:00

push.c

…

range-diff.c

…

read-tree.c

…

rebase.c

Merge branch 'ab/rebase-fatal-fatal-fix' into maint

2021-10-12 13:51:27 -07:00

receive-pack.c

…

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

builtin/repack.c: move .idx files into place last

2021-09-09 18:23:11 -07:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

show-branch: simplify rev_is_head()

2021-08-27 14:12:15 -07:00

show-index.c

…

show-ref.c

…

sparse-checkout.c

use fspathhash() everywhere

2021-07-30 12:14:27 -07:00

stash.c

stash: restore untracked files AFTER restoring tracked files

2021-09-10 15:46:34 -07:00

stripspace.c

…

submodule--helper.c

Merge branch 'ah/plugleaks'

2021-08-04 13:28:52 -07:00

symbolic-ref.c

…

tag.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

update-ref.c

update-ref: fix streaming of status updates

2021-09-03 11:35:15 -07:00

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

…

write-tree.c

…