Junio C Hamano 259e30d2bb Merge branch 'bc/merge-file-object-input' ...

"git merge-file" learns a mode to read three contents to be merged
from blob objects.

* bc/merge-file-object-input:
  merge-file: add an option to process object IDs
  git-merge-file doc: drop "-file" from argument placeholders

2023-11-08 11:04:01 +09:00

..

add.c

Merge branch 'ni/die-message-fix-for-git-add'

2023-10-30 07:09:57 +09:00

am.c

Merge branch 'rs/fix-arghelp'

2023-11-07 10:26:43 +09:00

annotate.c

…

apply.c

…

archive.c

…

bisect.c

doc/git-bisect: clarify git bisect run syntax

2023-10-23 13:04:47 -07:00

blame.c

…

branch.c

builtin/branch.c: adjust error messages to coding guidelines

2023-10-23 12:22:57 -07:00

bugreport.c

bugreport: reject positional arguments

2023-10-29 08:56:17 +09:00

bundle.c

…

cat-file.c

doc/cat-file: make synopsis and description less confusing

2023-10-09 12:46:33 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

…

checkout-index.c

…

checkout.c

Merge branch 'jc/unresolve-removal'

2023-10-02 11:20:00 -07:00

clean.c

…

clone.c

…

column.c

…

commit-graph.c

Merge branch 'jk/commit-graph-leak-fixes'

2023-10-13 14:18:28 -07:00

commit-tree.c

…

commit.c

Merge branch 'jc/commit-new-underscore-index-fix'

2023-10-30 07:09:58 +09:00

config.c

…

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

…

credential.c

…

describe.c

…

diagnose.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

diff --stat: set the width defaults in a helper function

2023-09-29 15:46:06 -07:00

difftool.c

…

fast-export.c

…

fast-import.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

…

for-each-ref.c

…

for-each-repo.c

…

fsck.c

…

fsmonitor--daemon.c

run-command: mark unused parameters in start_bg_wait callbacks

2023-09-18 15:56:15 -07:00

gc.c

Merge branch 'tb/repack-max-cruft-size'

2023-10-18 13:25:41 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'jc/grep-f-relative-to-cwd'

2023-11-07 10:26:43 +09:00

hash-object.c

…

help.c

…

hook.c

…

index-pack.c

…

init-db.c

…

interpret-trailers.c

Merge branch 'la/trailer-test-and-doc-updates'

2023-10-13 14:18:27 -07:00

log.c

diff --stat: set the width defaults in a helper function

2023-09-29 15:46:06 -07:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

merge-file: add an option to process object IDs

2023-11-02 08:51:40 +09:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

merge: introduce {copy|clear}_merge_options()

2023-10-11 13:37:47 -07:00

merge.c

Merge branch 'jk/commit-graph-leak-fixes'

2023-10-13 14:18:28 -07:00

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

pack-objects: allow --filter without --stdout

2023-10-02 14:54:29 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

…

push.c

…

range-diff.c

…

read-tree.c

…

rebase.c

Merge branch 'rs/fix-arghelp'

2023-11-07 10:26:43 +09:00

receive-pack.c

…

reflog.c

Merge branch 'kn/rev-list-missing-fix'

2023-11-08 11:04:01 +09:00

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

Merge branch 'tb/repack-max-cruft-size'

2023-10-18 13:25:41 -07:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

rev-list: add commit object support in --missing option

2023-11-01 12:07:18 +09:00

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-index.c

…

show-ref.c

builtin/show-ref: add new mode to check for reference existence

2023-11-01 12:09:01 +09:00

sparse-checkout.c

…

stash.c

Merge branch 'jc/fail-stash-to-store-non-stash'

2023-10-23 13:56:37 -07:00

stripspace.c

…

submodule--helper.c

submodule--helper: return error from set-url when modifying failed

2023-10-03 15:30:43 -07:00

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

Merge branch 'jc/unresolve-removal'

2023-10-02 11:20:00 -07:00

update-ref.c

…

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

…