Junio C Hamano 18254f14f2 Merge branch 'jc/show-branch-g-current' ...

The "--current" option of "git show-branch" should have been made
incompatible with the "--reflog" mode, but this was not enforced,
which has been corrected.

* jc/show-branch-g-current:
  show-branch: -g and --current are incompatible

2022-05-25 16:42:47 -07:00

..

add.c

add: remove support for git-legacy-stash

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

am.c

Merge branch 'ab/date-mode-release'

2022-02-25 15:47:36 -08:00

annotate.c

…

apply.c

apply.c: remove unnecessary include

2022-04-06 09:42:14 -07:00

archive.c

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

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

bisect--helper.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

blame.c

Merge branch 'ea/progress-partial-blame'

2022-05-10 17:41:11 -07:00

branch.c

Merge branch 'gc/branch-recurse-submodules'

2022-02-18 13:53:29 -08:00

bugreport.c

hook-list.h: add a generated list of hooks, like config-list.h

2021-09-27 09:44:54 -07:00

bundle.c

bundle: call strvec_clear() on allocated strvec

2022-03-04 13:24:18 -08:00

cat-file.c

Merge branch 'jc/cat-file-batch-default-format-optim'

2022-03-23 14:09:31 -07:00

check-attr.c

…

check-ignore.c

dir.[ch]: replace dir_init() with DIR_INIT

2021-07-01 12:32:22 -07:00

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

pkt-line.[ch]: remove unused packet_read_line_buf()

2021-10-15 13:09:40 -07:00

checkout-index.c

checkout-index: integrate with sparse index

2022-01-13 13:49:45 -08:00

checkout.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

clean.c

Merge branch 'vd/sparse-clean-etc'

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

clone.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

column.c

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

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

commit-graph.c

commit-graph: fix memory leak in misused string_list API

2022-03-04 13:24:18 -08:00

commit-tree.c

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

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

commit.c

Merge branch 'ab/commit-plug-leaks'

2022-05-23 14:39:54 -07:00

config.c

Merge branch 'mf/fix-type-in-config-h'

2022-03-16 17:53:07 -07:00

count-objects.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

credential-cache--daemon.c

…

credential-cache.c

credential-cache: check for windows specific errors

2021-09-14 09:30:54 -07:00

credential-store.c

Use a better name for the function interpolating paths

2021-07-26 12:17:16 -07:00

credential.c

doc: fix git credential synopsis

2021-10-28 09:57:09 -07:00

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-index: restore -c/--cc options handling

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

diff-tree.c

2.36 gitk/diff-tree --stdin regression fix

2022-04-26 09:26:35 -07:00

diff.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

difftool.c

i18n: factorize more 'incompatible options' messages

2022-02-04 13:58:28 -08:00

env--helper.c

…

fast-export.c

Merge branch 'rs/fast-export-pathspec-fix' into maint

2022-05-05 14:36:25 -07:00

fast-import.c

Merge branch 'ns/core-fsyncmethod'

2022-03-25 16:38:24 -07:00

fetch-pack.c

Merge branch 'rc/fetch-refetch'

2022-04-04 10:56:23 -07:00

fetch.c

Merge branch 'rc/fetch-refetch'

2022-04-04 10:56:23 -07: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-ref: delay parsing of --sort=<atom> options

2021-10-20 14:33:07 -07:00

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

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

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

fsmonitor--daemon.c

fsmonitor--daemon: use a cookie file to sync with file system

2022-03-25 16:04:17 -07:00

gc.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

hash-object.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

help.c

Merge branch 'ab/help-fixes'

2022-03-09 13:38:24 -08:00

hook.c

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

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

index-pack.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07: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 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

ls-files.c

ls-files: support --recurse-submodules --stage

2022-02-23 16:41:55 -08:00

ls-remote.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

ls-tree.c

Merge branch 'tl/ls-tree-oid-only'

2022-04-06 15:21:59 -07:00

mailinfo.c

…

mailsplit.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

merge-base.c

merge-base: free() allocated "struct commit **" list

2022-03-04 13:24:17 -08:00

merge-file.c

xdiff: implement a zealous diff3, or "zdiff3"

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

merge-index.c

…

merge-ours.c

builtins + test helpers: use return instead of exit() in cmd_*

2021-06-09 09:15:58 +09:00

merge-recursive.c

gettext API users: don't explicitly cast ngettext()'s "n"

2022-03-07 11:57:52 -08:00

merge-tree.c

xdiff users: use designated initializers for out_line

2021-05-11 12:47:31 +09:00

merge.c

hooks: fix an obscure TOCTOU "did we just run a hook?" race

2022-03-07 13:00:53 -08:00

mktag.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

mktree.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

multi-pack-index.c

multi-pack-index: use --object-dir real path

2022-04-25 11:31:12 -07:00

mv.c

mv: refuse to move sparse paths

2021-09-28 10:31:02 -07:00

name-rev.c

Merge branch 'rs/name-rev-fix-free-after-use' into maint

2022-05-05 14:36:24 -07:00

notes.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

pack-objects.c

Merge branch 'ds/partial-bundle-more'

2022-04-04 10:56:21 -07:00

pack-redundant.c

tree-wide: apply equals-null.cocci

2022-05-02 09:50:37 -07:00

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

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

prune.c

Merge branch 'ns/tmp-objdir'

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

pull.c

Merge branch 'gc/pull-recurse-submodules'

2022-05-20 15:26:57 -07:00

push.c

i18n: factorize "invalid value" messages

2022-02-04 13:58:28 -08:00

range-diff.c

…

read-tree.c

read-tree: make three-way merge sparse-aware

2022-03-01 12:36:01 -08:00

rebase.c

Merge branch 'ea/rebase-code-simplify'

2022-05-11 13:56:22 -07:00

receive-pack.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

reflog.c

reflog: fix 'show' subcommand's argv

2022-03-28 15:45:46 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'tb/rename-remote-progress'

2022-03-16 17:53:08 -07:00

repack.c

repack: add config to skip updating server info

2022-03-14 22:25:13 +00:00

replace.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

rerere.c

xdiff users: use designated initializers for out_line

2021-05-11 12:47:31 +09:00

reset.c

reset: show --no-refresh in the short-help

2022-03-24 13:36:21 -07:00

rev-list.c

Merge branch 'ds/partial-bundles'

2022-03-21 15:14:24 -07:00

rev-parse.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

revert.c

Merge branch 'ds/mergies-with-sparse-index'

2021-09-20 15:20:45 -07:00

rm.c

Merge branch 'ja/i18n-similar-messages'

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

send-pack.c

i18n: factorize "invalid value" messages

2022-02-04 13:58:28 -08:00

shortlog.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

show-branch.c

Merge branch 'jc/show-branch-g-current'

2022-05-25 16:42:47 -07:00

show-index.c

…

show-ref.c

…

sparse-checkout.c

Merge branch 'ep/remove-duplicated-includes'

2022-03-23 14:09:30 -07:00

stash.c

stash: apply stash using 'merge_ort_nonrecursive()'

2022-05-10 16:45:12 -07:00

stripspace.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

submodule--helper.c

Merge branch 'gc/submodule-update-part2' into maint

2022-05-05 14:36:24 -07:00

symbolic-ref.c

…

tag.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

unpack-file.c

…

unpack-objects.c

object-file API: have hash_object_file() take "enum object_type"

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

update-index.c

fsmonitor: config settings are repository-specific

2022-03-25 16:04:15 -07:00

update-ref.c

update-ref: fix streaming of status updates

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

update-server-info.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

upload-archive.c

upload-archive: use regular "struct child_process" pattern

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

upload-pack.c

upload-pack: document and rename --advertise-refs

2021-08-05 08:59:37 -07:00

var.c

var: add GIT_DEFAULT_BRANCH variable

2021-11-03 13:25:36 -07:00

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'pw/worktree-list-with-z'

2022-04-04 10:56:25 -07:00

write-tree.c

…