Junio C Hamano 1b49913760 Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge' into next ...

The advice message given by "git pull" when the user hasn't made a
choice between merge and rebase still said that the merge is the
default, which no longer is the case.  This has been corrected.

* ah/advice-pull-has-no-preference-between-rebase-and-merge:
  pull: don't say that merge is "the default strategy"

2021-12-02 13:29:51 -08:00

..

add.c

Merge branch 'ds/add-rm-with-sparse-index'

2021-10-13 15:15:56 -07:00

am.c

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

2021-10-13 15:15:57 -07:00

annotate.c

strvec: rename struct fields

2020-07-30 19:18:06 -07:00

apply.c

…

archive.c

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

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

bisect--helper.c

bisect--helper: add space between colon and following sentence

2021-10-01 15:47:53 -07:00

blame.c

Merge branch 'ab/parse-options-cleanup'

2021-10-25 16:06:59 -07:00

branch.c

for-each-ref: delay parsing of --sort=<atom> options

2021-10-20 14:33:07 -07: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

Merge branch 'ab/bundle-remove-verbose-option'

2021-10-03 21:49:20 -07:00

cat-file.c

cat-file: use packed_object_info() for --batch-all-objects

2021-10-08 15:45:14 -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

shortlog: remove unused(?) "repo-abbrev" feature

2021-01-12 14:04:42 -08:00

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

Merge branch 'mt/parallel-checkout-part-3'

2021-05-16 21:05:23 +09:00

checkout.c

checkout: fix "branch info" memory leaks

2021-11-18 14:32:26 -08:00

clean.c

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

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

clone.c

clone: fix a memory leak of the "git_dir" variable

2021-10-23 10:45:25 -07:00

column.c

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

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

commit-graph.c

Merge branch 'ab/ignore-replace-while-working-on-commit-graph'

2021-11-01 13:48:08 -07:00

commit-tree.c

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

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

commit.c

hook.c users: use "hook_exists()" instead of "find_hook()"

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

config.c

urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT

2021-10-01 14:22:51 -07:00

count-objects.c

…

credential-cache--daemon.c

unix-socket: add backlog size option to unix_stream_listen()

2021-03-15 14:32:51 -07:00

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

hash: provide per-algorithm null OIDs

2021-04-27 16:31:39 +09:00

diff-files.c

Merge branch 'jc/diffcore-rotate'

2021-02-25 16:43:30 -08:00

diff-index.c

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

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

diff-tree.c

Merge branch 'jc/diffcore-rotate'

2021-02-25 16:43:30 -08:00

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

assert PARSE_OPT_NONEG in parse-options callbacks

2020-09-30 12:53:47 -07:00

fast-export.c

Merge branch 'ab/fsck-unexpected-type'

2021-10-25 16:06:56 -07:00

fast-import.c

Use the final_oid_fn to finalize hashing of object IDs

2021-04-27 16:31:38 +09:00

fetch-pack.c

connect, transport: encapsulate arg in struct

2021-02-05 13:49:54 -08:00

fetch.c

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

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

fmt-merge-msg.c

Lib-ify fmt-merge-msg

2020-03-24 15:04:43 -07: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

Merge branch 'ab/fsck-unexpected-type'

2021-11-12 15:29:25 -08:00

gc.c

Merge branch 'ds/no-usable-cron-on-macos'

2021-11-10 15:01:20 -08:00

get-tar-commit-id.c

…

grep.c

grep: fix a "path_list" memory leak

2021-10-23 10:45:25 -07:00

hash-object.c

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

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

help.c

Merge branch 'ab/help-config-vars'

2021-10-13 15:15:58 -07:00

index-pack.c

i18n: fix typos found during l10n for git 2.34.0

2021-10-31 22:49:49 -07:00

init-db.c

Merge branch 'mt/init-template-userpath-fix'

2021-05-25 16:21:20 +09:00

interpret-trailers.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

log.c

revision: separate walk and unsorted flags

2021-08-05 09:37:28 -07:00

ls-files.c

ls-files: add missing string_list_clear()

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

ls-remote.c

for-each-ref: delay parsing of --sort=<atom> options

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

ls-tree.c

tree.h API: simplify read_tree_recursive() signature

2021-03-20 16:09:26 -07:00

mailinfo.c

mailinfo: allow squelching quoted CRLF warning

2021-05-10 15:06:22 +09:00

mailsplit.c

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

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

merge-base.c

rebase: --fork-point regression fix

2020-02-11 09:59:39 -08:00

merge-file.c

…

merge-index.c

merge-index: ensure full index

2021-04-14 13:47:21 -07:00

merge-ours.c

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

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

merge-recursive.c

…

merge-tree.c

xdiff users: use designated initializers for out_line

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

merge.c

Merge branch 'ab/mark-leak-free-tests-more'

2021-10-25 16:06:59 -07:00

mktag.c

fsck: report invalid object type-path combinations

2021-10-01 15:06:01 -07:00

mktree.c

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

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

multi-pack-index.c

builtin/multi-pack-index.c: don't leak concatenated options

2021-10-28 15:32:14 -07:00

mv.c

mv: refuse to move sparse paths

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

name-rev.c

oid_pos(): access table through const pointers

2021-01-28 12:03:26 -08:00

notes.c

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

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

pack-objects.c

builtin/pack-objects.c: don't leak memory via arguments

2021-10-27 16:26:37 -07:00

pack-redundant.c

builtin/pack-redundant: avoid casting buffers to struct object_id

2021-04-27 16:31:38 +09:00

pack-refs.c

…

patch-id.c

patch-id: use oid_to_hex() to print multiple object IDs

2019-12-09 12:26:40 -08:00

prune-packed.c

Lib-ify prune-packed

2020-03-24 15:04:44 -07:00

prune.c

repack, prune: drop GIT_REF_PARANOIA settings

2021-09-27 12:36:45 -07:00

pull.c

Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge' into next

2021-12-02 13:29:51 -08:00

push.c

advice: remove read uses of most global advice_ variables

2021-08-25 12:07:52 -07:00

range-diff.c

column, range-diff: downcase option description

2021-03-29 14:06:08 -07:00

read-tree.c

Change unpack_trees' 'reset' flag into an enum

2021-09-27 13:38:37 -07:00

rebase.c

Merge branch 'js/retire-preserve-merges'

2021-10-18 15:47:56 -07:00

receive-pack.c

Merge branch 'fs/ssh-signing'

2021-10-25 16:06:58 -07:00

reflog.c

reflog: free() ref given to us by dwim_log()

2021-10-23 10:45:25 -07:00

remote-ext.c

strvec: convert builtin/ callers away from argv_array name

2020-07-28 15:02:18 -07:00

remote-fd.c

…

remote.c

Merge branch 'ab/designated-initializers-more'

2021-10-18 15:47:57 -07:00

repack.c

builtin/repack.c: avoid leaking child arguments

2021-10-28 15:31:51 -07:00

replace.c

advice: move advice.graftFileDeprecated squashing to commit.[ch]

2021-08-25 12:07:52 -07:00

rerere.c

xdiff users: use designated initializers for out_line

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

reset.c

Change unpack_trees' 'reset' flag into an enum

2021-09-27 13:38:37 -07:00

rev-list.c

rev-list: add option for --pretty=format without header

2021-07-12 10:12:31 -07:00

rev-parse.c

refs: drop "broken" flag from for_each_fullref_in()

2021-09-27 12:36:45 -07:00

revert.c

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

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

rm.c

Merge branch 'ds/add-rm-with-sparse-index'

2021-10-13 15:15:56 -07:00

send-pack.c

Merge branch 'jk/http-push-status-fix'

2021-10-29 15:43:12 -07:00

shortlog.c

parse-options.[ch]: consistently use "enum parse_opt_result"

2021-10-08 14:13:11 -07:00

show-branch.c

parse-options API users: align usage output in C-strings

2021-09-12 18:57:30 -07:00

show-index.c

builtin/show-index: set the algorithm for object IDs

2021-04-27 16:31:39 +09:00

show-ref.c

refs: switch peel_ref() to peel_iterated_oid()

2021-01-21 15:51:31 -08:00

sparse-checkout.c

sparse-checkout: clear tracked sparse dirs

2021-09-07 22:41:10 -07:00

stash.c

stash: get rid of unused argument in stash_staged()

2021-10-28 14:17:14 -07:00

stripspace.c

…

submodule--helper.c

Merge branch 'ks/submodule-add-message-fix'

2021-10-29 15:43:14 -07:00

symbolic-ref.c

symbolic-ref: don't leak shortened refname in check_symref()

2021-03-14 15:57:59 -07:00

tag.c

for-each-ref: delay parsing of --sort=<atom> options

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

unpack-file.c

…

unpack-objects.c

hash: provide per-algorithm null OIDs

2021-04-27 16:31:39 +09:00

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

strvec: rename struct fields

2020-07-30 19:18:06 -07: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

Merge branch 'bc/sha-256-part-3'

2020-08-11 18:04:11 -07:00

verify-tag.c

…

worktree.c

hook.[ch]: move find_hook() from run-command.c to hook.c

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

write-tree.c

…