mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
031e2f7ae195069d00d21cde906fce5b0318dbdd
git/builtin
History
Elijah Newren 031e2f7ae1 pull: abort by default when fast-forwarding is not possible 
We have for some time shown a long warning when the user does not
specify how to reconcile divergent branches with git pull.  Make it an
error now.

Initial-patch-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-07-22 11:54:29 -07:00
..
add.c
Merge branch 'ow/no-dryrun-in-add-i'
2021-05-14 08:26:09 +09:00
am.c
am: learn to process quoted lines that ends with CRLF
2021-05-10 15:06:22 +09:00
annotate.c
…
apply.c
…
archive.c
…
bisect--helper.c
bisect--helper: use BISECT_TERMS in 'bisect skip' command
2021-04-30 09:56:42 +09:00
blame.c
Merge branch 'rs/blame-optim'
2021-02-25 16:43:29 -08:00
branch.c
ref-filter: reuse output buffer
2021-04-20 11:09:50 -07:00
bugreport.c
builtin/bugreport: don't leak prefixed filename
2021-04-28 09:25:45 +09:00
bundle.c
…
cat-file.c
cat-file: merge two block into one
2021-06-04 07:50:26 +09:00
check-attr.c
…
check-ignore.c
Merge branch 'ah/plugleaks'
2021-05-07 12:47:41 +09: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
builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
2021-06-15 12:07:56 +09:00
checkout-index.c
Merge branch 'mt/parallel-checkout-part-3'
2021-05-16 21:05:23 +09:00
checkout.c
Merge branch 'mt/parallel-checkout-part-3'
2021-05-16 21:05:23 +09:00
clean.c
Merge branch 'en/dir-traversal'
2021-05-20 08:54:59 +09:00
clone.c
Merge branch 'jk/clone-clean-upon-transport-error'
2021-06-14 13:33:26 +09:00
column.c
column, range-diff: downcase option description
2021-03-29 14:06:08 -07:00
commit-graph.c
builtin/*: update usage format
2021-01-06 15:10:49 -08:00
commit-tree.c
…
commit.c
Merge branch 'ds/sparse-index-protections'
2021-04-30 13:50:26 +09:00
config.c
config: unify code paths to get global config paths
2021-04-19 14:16:59 -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
unix-socket: disallow chdir() when creating unix domain sockets
2021-03-15 14:32:51 -07:00
credential-store.c
crendential-store: use timeout when locking file
2020-11-25 12:30:18 -08:00
credential.c
…
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-merges: move specific diff-index "-m" handling to diff-index
2021-05-21 09:24:14 +09:00
diff-tree.c
Merge branch 'jc/diffcore-rotate'
2021-02-25 16:43:30 -08:00
diff.c
hash: provide per-algorithm null OIDs
2021-04-27 16:31:39 +09:00
difftool.c
Merge branch 'ab/cmd-foo-should-return'
2021-07-08 13:15:04 -07:00
env--helper.c
…
fast-export.c
hash: provide per-algorithm null OIDs
2021-04-27 16:31:39 +09: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
fetch: improve grammar of "shallow roots" message
2021-05-20 13:36:33 +09:00
fmt-merge-msg.c
…
for-each-ref.c
Merge branch 'ah/plugleaks'
2021-05-07 12:47:41 +09:00
for-each-repo.c
for-each-repo: do nothing on empty config
2021-01-07 19:12:02 -08:00
fsck.c
Merge branch 'ab/fsck-api-cleanup'
2021-06-02 07:34:27 +09:00
gc.c
maintenance: fix two memory leaks
2021-05-12 07:00:45 +09:00
get-tar-commit-id.c
…
grep.c
Merge branch 'bc/hash-transition-interop-part-1'
2021-05-10 16:59:46 +09:00
hash-object.c
…
help.c
…
index-pack.c
Use the final_oid_fn to finalize hashing of object IDs
2021-04-27 16:31:38 +09:00
init-db.c
Merge branch 'mt/init-template-userpath-fix'
2021-05-25 16:21:20 +09:00
interpret-trailers.c
…
log.c
*: fix typos which duplicate a word
2021-06-14 10:16:06 +09:00
ls-files.c
Merge branch 'en/dir-traversal'
2021-05-20 08:54:59 +09:00
ls-remote.c
Merge branch 'ah/plugleaks'
2021-04-07 16:54:08 -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
…
merge-base.c
…
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
pull: abort if --ff-only is given and fast-forwarding is impossible
2021-07-20 21:43:12 -07:00
mktag.c
fsck.c: add an fsck_set_msg_type() API that takes enums
2021-03-28 19:03:10 -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
midx: allow marking a pack as preferred
2021-04-01 13:07:37 -07:00
mv.c
git mv foo FOO ; git mv foo bar gave an assert
2021-03-03 17:07:12 -08:00
name-rev.c
oid_pos(): access table through const pointers
2021-01-28 12:03:26 -08:00
notes.c
use CALLOC_ARRAY
2021-03-13 16:00:09 -08:00
pack-objects.c
Merge branch 'ab/pack-linkage-fix'
2021-05-27 12:36:58 +09: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
…
prune-packed.c
…
prune.c
…
pull.c
pull: abort by default when fast-forwarding is not possible
2021-07-22 11:54:29 -07:00
push.c
push: don't get a full remote object
2021-06-02 10:12:03 +09:00
range-diff.c
column, range-diff: downcase option description
2021-03-29 14:06:08 -07:00
read-tree.c
…
rebase.c
Merge branch 'bc/hash-transition-interop-part-1'
2021-05-10 16:59:46 +09:00
receive-pack.c
hash: provide per-algorithm null OIDs
2021-04-27 16:31:39 +09:00
reflog.c
reflog expire --stale-fix: be generous about missing objects
2021-02-11 09:21:52 -08:00
remote-ext.c
…
remote-fd.c
…
remote.c
Merge branch 'ah/plugleaks'
2021-04-07 16:54:08 -07:00
repack.c
repack: avoid loosening promisor objects in partial clones
2021-04-28 13:36:13 +09:00
replace.c
…
rerere.c
xdiff users: use designated initializers for out_line
2021-05-11 12:47:31 +09:00
reset.c
reset: free instead of leaking unneeded ref
2021-03-14 15:57:59 -07:00
rev-list.c
rev-list: allow filtering of provided items
2021-04-19 14:09:11 -07:00
rev-parse.c
rev-parse: mark die() messages for translation
2021-05-17 18:39:53 +09:00
revert.c
sequencer: fix edit handling for cherry-pick and revert messages
2021-03-31 14:10:50 -07:00
rm.c
Merge branch 'ah/plugleaks'
2021-05-07 12:47:41 +09:00
send-pack.c
…
shortlog.c
Merge branch 'ab/mailmap'
2021-01-25 14:19:19 -08:00
show-branch.c
…
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
Merge branch 'ds/sparse-index-protections'
2021-04-30 13:50:26 +09:00
stash.c
Merge branch 'so/log-m-implies-p'
2021-06-14 13:33:27 +09:00
stripspace.c
…
submodule--helper.c
Merge branch 'ah/submodule-helper-module-summary-parseopt'
2021-06-10 12:04:24 +09:00
symbolic-ref.c
symbolic-ref: don't leak shortened refname in check_symref()
2021-03-14 15:57:59 -07:00
tag.c
ref-filter: reuse output buffer
2021-04-20 11:09:50 -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
update-index: ensure full index
2021-04-14 13:47:29 -07:00
update-ref.c
update-ref: disallow "start" for ongoing transactions
2020-11-16 13:44:01 -08:00
update-server-info.c
…
upload-archive.c
…
upload-pack.c
…
var.c
…
verify-commit.c
…
verify-pack.c
…
verify-tag.c
…
worktree.c
Merge branch 'en/dir-traversal'
2021-05-20 08:54:59 +09:00
write-tree.c
…