Junio C Hamano d077db1df0 Merge branch 'jz/patch-id-hunk-header-parsing-fix' ...

Unlike "git apply", "git patch-id" did not handle patches with
hunks that has only 1 line in either preimage or postimage, which
has been corrected.

* jz/patch-id-hunk-header-parsing-fix:
  patch-id: fix scan_hunk_header on diffs with 1 line of before/after
  patch-id: fix antipatterns in tests

2022-02-17 16:25:04 -08:00

..

add.c

add: remove support for git-legacy-stash

2022-01-27 18:00:15 -08:00

am.c

Merge branch 'ab/config-based-hooks-2'

2022-02-09 14:21:00 -08:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'ld/sparse-diff-blame'

2021-12-21 15:03:17 -08:00

branch.c

Merge branch 'js/branch-track-inherit'

2022-01-20 15:25:38 -08:00

bugreport.c

…

bundle.c

…

cat-file.c

cat-file: s/_/-/ in typo'd usage_msg_optf() message

2022-01-12 10:12:39 -08:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

…

checkout-index.c

…

checkout.c

Merge branch 'en/remerge-diff'

2022-02-16 15:14:29 -08:00

clean.c

clean: do not attempt to remove startup_info->original_cwd

2021-12-09 13:33:13 -08:00

clone.c

Merge branch 'jt/clone-not-quite-empty'

2022-02-09 14:21:01 -08:00

column.c

…

commit-graph.c

…

commit-tree.c

…

commit.c

i18n: turn even more messages into "cannot be used together" ones

2022-01-05 13:31:00 -08:00

config.c

…

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

…

credential.c

…

describe.c

i18n: turn even more messages into "cannot be used together" ones

2022-01-05 13:31:00 -08:00

diff-files.c

…

diff-index.c

…

diff-tree.c

i18n: refactor "foo and bar are mutually exclusive"

2022-01-05 13:29:23 -08:00

diff.c

builtin/diff.c: fix "git-diff" usage string typo

2022-02-02 11:30:53 -08:00

difftool.c

i18n: turn "options are incompatible" into "cannot be used together"

2022-01-05 13:29:23 -08:00

env--helper.c

…

fast-export.c

Merge branch 'ja/i18n-similar-messages'

2022-01-10 11:52:56 -08:00

fast-import.c

usage.c API users: use die_message() for "fatal :" + exit 128

2021-12-07 13:25:15 -08:00

fetch-pack.c

…

fetch.c

Merge branch 'tg/fetch-prune-exit-code-fix'

2022-02-11 16:56:01 -08:00

fmt-merge-msg.c

merge: allow to pretend a merge is made into a different branch

2021-12-20 14:55:02 -08:00

for-each-ref.c

…

for-each-repo.c

…

fsck.c

run-command API users: use strvec_pushl(), not argv construction

2021-11-25 22:15:07 -08:00

gc.c

Merge branch 'ab/config-based-hooks-2'

2022-02-09 14:21:00 -08:00

get-tar-commit-id.c

…

grep.c

…

hash-object.c

…

help.c

run-command API users: use strvec_pushl(), not argv construction

2021-11-25 22:15:07 -08:00

hook.c

git hook run: add an --ignore-missing flag

2022-01-07 15:19:34 -08:00

index-pack.c

i18n: factorize "--foo requires --bar" and the like

2022-01-05 13:31:00 -08:00

init-db.c

i18n: refactor "foo and bar are mutually exclusive"

2022-01-05 13:29:23 -08:00

interpret-trailers.c

…

log.c

Merge branch 'en/remerge-diff'

2022-02-16 15:14:29 -08:00

ls-files.c

Merge branch 'ja/i18n-similar-messages'

2022-01-10 11:52:56 -08:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

xdiff: implement a zealous diff3, or "zdiff3"

2021-12-01 14:45:58 -08:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'en/plug-leaks-in-merge'

2022-02-09 14:21:00 -08:00

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

name-rev.c: use strbuf_getline instead of limited size buffer

2022-01-10 09:39:26 -08:00

notes.c

Merge branch 'ab/usage-die-message'

2022-01-10 11:52:53 -08:00

pack-objects.c

i18n: turn "options are incompatible" into "cannot be used together"

2022-01-05 13:29:23 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

patch-id: fix scan_hunk_header on diffs with 1 line of before/after

2022-02-02 11:24:23 -08:00

prune-packed.c

…

prune.c

Merge branch 'ns/tmp-objdir'

2022-01-03 16:24:15 -08:00

pull.c

Merge branch 'pb/pull-rebase-autostash-fix'

2022-02-05 09:42:28 -08:00

push.c

i18n: turn "options are incompatible" into "cannot be used together"

2022-01-05 13:29:23 -08:00

range-diff.c

…

read-tree.c

…

rebase.c

Merge branch 'ab/config-based-hooks-2'

2022-02-09 14:21:00 -08:00

receive-pack.c

Merge branch 'ab/config-based-hooks-2'

2022-02-09 14:21:00 -08:00

reflog.c

builtin/reflog.c: use parse-options api for expire, delete subcommands

2022-01-10 14:13:06 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

Merge branch 'ja/i18n-similar-messages'

2022-01-10 11:52:56 -08:00

replace.c

run-command API users: use strvec_pushl(), not argv construction

2021-11-25 22:15:07 -08:00

rerere.c

…

reset.c

i18n: turn even more messages into "cannot be used together" ones

2022-01-05 13:31:00 -08:00

rev-list.c

i18n: turn even more messages into "cannot be used together" ones

2022-01-05 13:31:00 -08:00

rev-parse.c

…

revert.c

…

rm.c

Merge branch 'ja/i18n-similar-messages'

2022-01-10 11:52:56 -08:00

send-pack.c

…

shortlog.c

…

show-branch.c

i18n: turn "options are incompatible" into "cannot be used together"

2022-01-05 13:29:23 -08:00

show-index.c

…

show-ref.c

…

sparse-checkout.c

Merge branch 'en/sparse-checkout-leakfix'

2022-02-11 16:56:01 -08:00

stash.c

Merge branch 'js/no-more-legacy-stash'

2022-02-16 15:14:30 -08:00

stripspace.c

…

submodule--helper.c

i18n: refactor "foo and bar are mutually exclusive"

2022-01-05 13:29:23 -08:00

symbolic-ref.c

…

tag.c

i18n: tag.c factorize i18n strings

2022-01-05 13:31:00 -08:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

update-index: refresh should rewrite index in case of racy timestamps

2022-01-07 12:37:31 -08:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

upload-archive: use regular "struct child_process" pattern

2021-11-25 22:15:07 -08:00

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'ab/config-based-hooks-2'

2022-02-09 14:21:00 -08:00

write-tree.c

…