Junio C Hamano 299deeac8a Merge branch 'ah/pull' ...

Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.

* ah/pull:
  pull: don't warn if pull.ff has been set

2020-09-29 14:01:22 -07:00

..

add.c

add -i: use the built-in version when feature.experimental is set

2020-09-08 14:53:36 -07:00

am.c

Merge branch 'ds/maintenance-part-1'

2020-09-25 15:25:38 -07:00

annotate.c

strvec: rename struct fields

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

apply.c

…

archive.c

…

bisect--helper.c

bisect: swap command-line options in documentation

2020-08-28 14:06:06 -07:00

blame.c

messages: avoid SHA-1 in end-user facing messages

2020-08-14 09:33:37 -07:00

branch.c

ref-filter: allow merged and no-merged filters

2020-09-16 12:38:10 -07:00

bugreport.c

Merge branch 'jk/slimmed-down'

2020-09-03 12:37:02 -07:00

bundle.c

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

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

cat-file.c

Merge branch 'cc/cat-file-usage-update' into master

2020-07-09 14:00:41 -07:00

check-attr.c

…

check-ignore.c

dir: fix problematic API to avoid memory leaks

2020-08-18 17:17:31 -07:00

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jt/interpret-branch-name-fallback'

2020-09-09 13:53:09 -07:00

clean.c

quote_path: give flags parameter to quote_path()

2020-09-10 10:49:19 -07:00

clone.c

builtin/clone: avoid failure with GIT_DEFAULT_HASH

2020-09-22 09:22:32 -07:00

column.c

…

commit-graph.c

commit-graph: introduce 'commitGraph.maxNewFilters'

2020-09-18 10:39:22 -07:00

commit-tree.c

…

commit.c

Merge branch 'ds/maintenance-part-1'

2020-09-25 15:25:38 -07:00

config.c

Merge branch 'ls/mergetool-meld-auto-merge'

2020-09-22 12:36:29 -07:00

count-objects.c

…

credential-cache--daemon.c

make credential helpers builtins

2020-08-13 11:02:08 -07:00

credential-cache.c

Merge branch 'jc/undash-in-tree-git-callers'

2020-09-03 12:37:03 -07:00

credential-store.c

make credential helpers builtins

2020-08-13 11:02:08 -07:00

credential.c

…

describe.c

strvec: rename struct fields

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

diff-files.c

diff-files: treat "i-t-a" files as "not-in-index"

2020-06-22 10:46:45 -07:00

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'ct/diff-with-merge-base-clarification' into master

2020-07-09 14:00:43 -07:00

difftool.c

strvec: rename struct fields

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

env--helper.c

…

fast-export.c

wt-status: tolerate dangling marks

2020-09-02 14:39:25 -07:00

fast-import.c

fast-import: use write_pack_header()

2020-09-06 13:40:37 -07:00

fetch-pack.c

fetch-pack: remove no_dependents code

2020-08-18 16:46:53 -07:00

fetch.c

Merge branch 'ds/maintenance-part-1'

2020-09-25 15:25:38 -07:00

fmt-merge-msg.c

…

for-each-ref.c

ref-filter: allow merged and no-merged filters

2020-09-16 12:38:10 -07:00

fsck.c

fsck: do not lazy fetch known non-promisor object

2020-08-06 13:01:03 -07:00

gc.c

maintenance: add trace2 regions for task execution

2020-09-17 11:30:05 -07:00

get-tar-commit-id.c

…

grep.c

quote_path: give flags parameter to quote_path()

2020-09-10 10:49:19 -07:00

hash-object.c

…

help.c

help: drop usage of 'common' and 'useful' for guides

2020-08-04 18:34:01 -07:00

index-pack.c

Merge branch 'jt/threaded-index-pack'

2020-09-22 12:36:28 -07:00

init-db.c

builtin/clone: avoid failure with GIT_DEFAULT_HASH

2020-09-22 09:22:32 -07:00

interpret-trailers.c

…

log.c

Merge branch 'es/format-patch-interdiff-cleanup'

2020-09-22 12:36:28 -07:00

ls-files.c

dir: fix problematic API to avoid memory leaks

2020-08-18 17:17:31 -07:00

ls-remote.c

Merge branch 'jk/unleak-fixes'

2020-08-24 14:54:30 -07:00

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'ds/maintenance-part-1'

2020-09-25 15:25:38 -07:00

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

git-mv: improve error message for conflicted file

2020-07-20 14:35:43 -07:00

name-rev.c

messages: avoid SHA-1 in end-user facing messages

2020-08-14 09:33:37 -07:00

notes.c

…

pack-objects.c

Merge branch 'jc/object-names-are-not-sha-1'

2020-08-19 16:14:52 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'ah/pull'

2020-09-29 14:01:22 -07:00

push.c

refspec: add and use refspec_appendf()

2020-09-06 13:15:46 -07:00

range-diff.c

strvec: convert builtin/ callers away from argv_array name

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

read-tree.c

…

rebase.c

Merge branch 'ds/maintenance-part-1'

2020-09-25 15:25:38 -07:00

receive-pack.c

Merge branch 'jx/proc-receive-hook'

2020-09-25 15:25:39 -07:00

reflog.c

Merge branch 'es/get-worktrees-unsort'

2020-07-06 22:09:15 -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 'cs/don-t-pretend-a-failed-remote-set-head-succeeded'

2020-09-22 12:36:32 -07:00

repack.c

Merge branch 'tb/repack-clearing-midx'

2020-09-09 13:53:06 -07:00

replace.c

strvec: rename struct fields

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

rerere.c

…

reset.c

wt-status: tolerate dangling marks

2020-09-02 14:39:25 -07:00

rev-list.c

bisect: combine args passed to find_bisection()

2020-08-07 15:13:03 -07:00

rev-parse.c

wt-status: tolerate dangling marks

2020-09-02 14:39:25 -07:00

revert.c

…

rm.c

…

send-pack.c

Merge branch 'jx/proc-receive-hook'

2020-09-25 15:25:39 -07:00

shortlog.c

…

show-branch.c

Merge branch 'jt/interpret-branch-name-fallback'

2020-09-09 13:53:09 -07:00

show-index.c

…

show-ref.c

…

sparse-checkout.c

Merge branch 'xl/upgrade-repo-format'

2020-06-29 14:17:24 -07:00

stash.c

Merge branch 'jt/interpret-branch-name-fallback'

2020-09-09 13:53:09 -07:00

stripspace.c

…

submodule--helper.c

Merge branch 'ss/submodule-summary-in-c-fixes'

2020-09-09 13:53:07 -07:00

symbolic-ref.c

…

tag.c

ref-filter: allow merged and no-merged filters

2020-09-16 12:38:10 -07:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

strvec: rename files from argv-array to strvec

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

update-server-info.c

…

upload-archive.c

strvec: rename struct fields

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

upload-pack.c

…

var.c

…

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

Merge branch 'es/wt-add-detach'

2020-09-18 17:58:04 -07:00

write-tree.c

…