Taylor Blau b1e3dd68ee Merge branch 'en/merge-tree-sequence' ...

"git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.

* en/merge-tree-sequence:
  merge-tree: support multiple batched merges with --stdin
  merge-tree: update documentation for differences in -z output

2022-10-30 21:04:44 -04:00

..

add.c

…

am.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

annotate.c

…

apply.c

…

archive.c

parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options

2022-08-19 11:13:14 -07:00

bisect--helper.c

Merge branch 'rs/bisect-start-leakfix'

2022-10-17 14:56:32 -07:00

blame.c

doc txt & -h consistency: make "annotate" consistent

2022-10-13 09:32:57 -07:00

branch.c

Merge branch 'rj/branch-do-not-exit-with-minus-one-status'

2022-10-30 21:04:43 -04:00

bugreport.c

doc txt & -h consistency: fix mismatching labels

2022-10-13 09:32:56 -07:00

bundle.c

Merge branch 'ds/bundle-uri-3'

2022-10-30 21:04:44 -04:00

cat-file.c

doc txt & -h consistency: add "-z" to cat-file "-h"

2022-10-13 09:32:55 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

…

checkout-index.c

…

checkout.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

clean.c

doc txt & -h consistency: use "[<label>...]" for "zero or more"

2022-10-13 09:32:57 -07:00

clone.c

Sync with v2.38.1

2022-10-17 15:46:09 -07:00

column.c

…

commit-graph.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

commit-tree.c

doc txt & -h consistency: add missing options

2022-10-13 09:32:57 -07:00

commit.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

config.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

count-objects.c

…

credential-cache--daemon.c

doc txt & -h consistency: use "git foo" form, not "git-foo"

2022-10-13 09:32:57 -07:00

credential-cache.c

…

credential-store.c

…

credential.c

…

describe.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

diagnose.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

diff-files.c

built-ins: consistently add "\n" between "usage" and options

2022-10-13 09:32:54 -07:00

diff-index.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

diff-tree.c

doc txt & -h consistency: make "diff-tree" consistent

2022-10-13 09:32:57 -07:00

diff.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

difftool.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

env--helper.c

parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options

2022-08-19 11:13:14 -07:00

fast-export.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

fast-import.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

fetch-pack.c

list-objects-filter: add and use initializers

2022-09-12 08:38:59 -07:00

fetch.c

run-command API: move *_tr2() users to "run_processes_parallel()"

2022-10-12 14:12:41 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

for-each-repo.c

doc txt & -h consistency: add or fix optional "--" syntax

2022-10-13 09:32:56 -07:00

fsck.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

fsmonitor--daemon.c

Merge branch 'ed/fsmonitor-on-networked-macos'

2022-10-17 14:56:31 -07:00

gc.c

Merge branch 'jk/unused-anno-more'

2022-10-27 14:51:52 -07:00

get-tar-commit-id.c

…

grep.c

builtin/grep.c: integrate with sparse index

2022-09-23 09:41:27 -07:00

hash-object.c

doc txt & -h consistency: add missing options

2022-10-13 09:32:57 -07:00

help.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

hook.c

builtin/hook.c: let parse-options parse subcommands

2022-08-19 11:13:15 -07:00

index-pack.c

…

init-db.c

doc txt & -h consistency: add missing options

2022-10-13 09:32:57 -07:00

interpret-trailers.c

doc txt & -h consistency: add missing options

2022-10-13 09:32:57 -07:00

log.c

Merge branch 'tb/shortlog-group'

2022-10-30 21:04:42 -04:00

ls-files.c

ls-files: fix black space in error message

2022-09-12 09:25:40 -07:00

ls-remote.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

ls-tree.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

mailinfo.c

…

mailsplit.c

…

merge-base.c

doc txt & -h consistency: make output order consistent

2022-10-13 09:32:56 -07:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

merge-tree: support multiple batched merges with --stdin

2022-10-22 22:21:26 -07:00

merge.c

Merge branch 'en/merge-unstash-only-on-clean-merge' into maint

2022-09-13 12:21:11 -07:00

mktag.c

…

mktree.c

…

multi-pack-index.c

multi-pack-index: avoid writing to global in option callback

2022-10-06 09:56:51 -07:00

mv.c

Merge branch 'sy/mv-out-of-cone'

2022-09-19 14:35:23 -07:00

name-rev.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

notes.c

notes, remote: show unknown subcommands between `'

2022-09-07 12:06:12 -07:00

pack-objects.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

pack-redundant.c

doc txt & -h consistency: fix mismatching labels

2022-10-13 09:32:56 -07:00

pack-refs.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

patch-id.c

builtin: patch-id: remove unused diff-tree prefix

2022-10-24 15:44:20 -07:00

prune-packed.c

…

prune.c

…

pull.c

…

push.c

push: improve grammar of branch.autoSetupMerge advice

2022-09-28 19:03:10 -07:00

range-diff.c

range-diff: optionally accept pathspecs

2022-08-26 09:49:26 -07:00

read-tree.c

doc txt & -h consistency: make "read-tree" consistent

2022-10-13 09:32:56 -07:00

rebase.c

Merge branch 'pw/rebase-reflog-fixes'

2022-10-30 21:04:43 -04:00

receive-pack.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

reflog.c

refs: unify parse_worktree_ref() and ref_type()

2022-09-19 11:11:11 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'jk/unused-anno-more'

2022-10-27 14:51:52 -07:00

repack.c

Merge branch 'jk/repack-tempfile-cleanup'

2022-10-30 21:04:42 -04:00

replace.c

refs: use ref_namespaces for replace refs base

2022-08-05 14:13:12 -07:00

rerere.c

doc txt & -h consistency: make "rerere" consistent

2022-10-13 09:32:56 -07:00

reset.c

pathspec.h: move pathspec_needs_expanded_index() from reset.c to here

2022-08-08 13:23:26 -07:00

rev-list.c

doc txt & -h consistency: add or fix optional "--" syntax

2022-10-13 09:32:56 -07:00

rev-parse.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

revert.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

rm.c

doc txt & -h consistency: add missing options

2022-10-13 09:32:57 -07:00

send-pack.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

shortlog.c

shortlog: implement --group=committer in terms of --group=<format>

2022-10-24 14:48:05 -07:00

show-branch.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

show-index.c

…

show-ref.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

sparse-checkout.c

doc txt & -h consistency: use "<options>", not "<options>..."

2022-10-13 09:32:55 -07:00

stash.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

stripspace.c

…

submodule--helper.c

Merge branch 'ab/run-hook-api-cleanup'

2022-10-27 14:51:53 -07:00

symbolic-ref.c

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-10-28 11:26:54 -07:00

tag.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

unpack-file.c

doc txt & -h consistency: fix mismatching labels

2022-10-13 09:32:56 -07:00

unpack-objects.c

…

update-index.c

update-index: drop unused argc from do_reupdate()

2022-10-17 21:24:03 -07:00

update-ref.c

…

update-server-info.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

upload-archive.c

doc txt & -h consistency: fix mismatching labels

2022-10-13 09:32:56 -07:00

upload-pack.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

var.c

…

verify-commit.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

verify-pack.c

doc txt & -h consistency: add or fix optional "--" syntax

2022-10-13 09:32:56 -07:00

verify-tag.c

doc txt & -h consistency: add missing options and labels

2022-10-13 09:32:56 -07:00

worktree.c

doc txt & -h consistency: make "worktree" consistent

2022-10-13 09:32:58 -07:00

write-tree.c

…