mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cf98b69053996728f131671ed7ff9581b0e8943a
git/builtin
History
Junio C Hamano 624a936234 Merge branch 'en/merge-multi-strategies' 
The code that implements multi-strategy support in "git merge" has
been clean-up a bit.

* en/merge-multi-strategies:
  merge: small code readability improvement
  merge: cleanup confusing logic for handling successful merges
2022-09-01 13:40:19 -07:00
..
add.c
Merge branch 'ab/plug-leak-in-revisions'
2022-06-07 14:10:56 -07:00
am.c
revisions API users: add straightforward release_revisions()
2022-04-13 23:56:08 -07:00
annotate.c
…
apply.c
apply.c: remove unnecessary include
2022-04-06 09:42:14 -07:00
archive.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
bisect--helper.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
blame.c
parse-options: add support for parsing subcommands
2022-08-19 11:13:14 -07:00
branch.c
branch: drop unused worktrees variable
2022-06-21 08:52:37 -07:00
bugreport.c
builtin/bugreport.c: create '--diagnose' option
2022-08-12 13:20:02 -07:00
bundle.c
builtin/bundle.c: let parse-options parse subcommands
2022-08-19 11:13:15 -07:00
cat-file.c
Merge branch 'tb/cat-file-z'
2022-08-05 15:52:14 -07:00
check-attr.c
…
check-ignore.c
…
check-mailmap.c
…
check-ref-format.c
check-ref-format: fix trivial memory leak
2022-07-01 11:43:42 -07:00
checkout--worker.c
…
checkout-index.c
checkout-index: integrate with sparse index
2022-01-13 13:49:45 -08:00
checkout.c
Merge branch 'vd/sparse-reset-checkout-fixes'
2022-08-18 13:07:04 -07:00
clean.c
Merge branch 'vd/sparse-clean-etc'
2022-02-17 16:25:05 -08:00
clone.c
clone: warn on failure to repo_init()
2022-08-24 08:46:36 -07:00
column.c
…
commit-graph.c
pass subcommand "prefix" arguments to parse_options()
2022-08-25 09:43:29 -07:00
commit-tree.c
…
commit.c
Merge branch 'ab/plug-leak-in-revisions'
2022-06-07 14:10:56 -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-store.c
…
credential.c
…
describe.c
revisions API users: add straightforward release_revisions()
2022-04-13 23:56:08 -07:00
diagnose.c
builtin/diagnose.c: add '--mode' option
2022-08-12 13:20:02 -07:00
diff-files.c
diff-files: move misplaced cleanup label
2022-07-12 07:17:28 -07:00
diff-index.c
revisions API: call diff_free(&revs->pruning) in revisions_release()
2022-04-13 23:56:10 -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 'ab/plug-leak-in-revisions'
2022-06-07 14:10:56 -07:00
difftool.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
env--helper.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
fast-export.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
fast-import.c
i18n: fix mismatched camelCase config variables
2022-06-17 10:38:26 -07:00
fetch-pack.c
Merge branch 'rc/fetch-refetch'
2022-04-04 10:56:23 -07:00
fetch.c
Merge branch 'ds/decorate-filter-tweak'
2022-08-29 14:55:11 -07:00
fmt-merge-msg.c
…
for-each-ref.c
…
for-each-repo.c
…
fsck.c
fsck: do not dereference NULL while checking resolve-undo data
2022-07-11 16:26:33 -07:00
fsmonitor--daemon.c
fsmonitor--daemon: stub in health thread
2022-05-26 15:59:27 -07:00
gc.c
Merge branch 'sg/parse-options-subcommand'
2022-09-01 13:40:18 -07:00
get-tar-commit-id.c
…
grep.c
grep: add --max-count command line option
2022-06-22 13:23:29 -07:00
hash-object.c
Merge branch 'ab/object-file-api-updates'
2022-03-16 17:53:08 -07:00
help.c
git docs: add a category for file formats, protocols and interfaces
2022-08-04 14:12:23 -07:00
hook.c
builtin/hook.c: let parse-options parse subcommands
2022-08-19 11:13:15 -07:00
index-pack.c
i18n: fix mismatched camelCase config variables
2022-06-17 10:38:26 -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 'sg/parse-options-subcommand'
2022-09-01 13:40:18 -07:00
ls-files.c
ls-files: introduce "--format" option
2022-07-23 10:53:55 -07: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
merge-file: fix memory leaks on error path
2022-07-01 11:43:43 -07:00
merge-index.c
…
merge-ours.c
…
merge-recursive.c
gettext API users: don't explicitly cast ngettext()'s "n"
2022-03-07 11:57:52 -08:00
merge-tree.c
merge-tree: add a --allow-unrelated-histories flag
2022-06-22 16:10:06 -07:00
merge.c
Merge branch 'en/merge-multi-strategies'
2022-09-01 13:40:19 -07:00
mktag.c
Merge branch 'ab/object-file-api-updates'
2022-03-16 17:53:08 -07:00
mktree.c
mktree: do not check type of remote objects
2022-06-21 10:12:15 -07:00
multi-pack-index.c
pass subcommand "prefix" arguments to parse_options()
2022-08-25 09:43:29 -07:00
mv.c
Merge branch 'jc/builtin-mv-move-array'
2022-07-18 13:31:53 -07:00
name-rev.c
name-rev: prefix annotate-stdin with '--' in message
2022-06-20 16:20:45 -07:00
notes.c
builtin/notes.c: let parse-options parse subcommands
2022-08-19 11:13:15 -07:00
pack-objects.c
i18n: fix mismatched camelCase config variables
2022-06-17 10:38:26 -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
revisions API users: add straightforward release_revisions()
2022-04-13 23:56:08 -07:00
pull.c
pull: fix a "struct oid_array" memory leak
2022-07-01 11:43:43 -07:00
push.c
push: fix capitalisation of the option name autoSetupMerge
2022-06-15 11:45:46 -07: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
rebase: add rebase.updateRefs config option
2022-07-19 12:49:04 -07:00
receive-pack.c
Merge branch 'ab/bug-if-bug'
2022-06-10 15:04:15 -07:00
reflog.c
Merge branch 'sg/parse-options-subcommand'
2022-09-01 13:40:18 -07:00
remote-ext.c
…
remote-fd.c
…
remote.c
Merge branch 'sg/parse-options-subcommand'
2022-09-01 13:40:18 -07:00
repack.c
cocci: generalize "unused" rule to cover more than "strbuf"
2022-07-06 12:24:43 -07:00
replace.c
refs: use ref_namespaces for replace refs base
2022-08-05 14:13:12 -07:00
rerere.c
…
reset.c
pathspec.h: move pathspec_needs_expanded_index() from reset.c to here
2022-08-08 13:23:26 -07:00
rev-list.c
rev-list: support human-readable output for --disk-usage
2022-08-11 13:45:23 -07:00
rev-parse.c
Merge branch 'ep/maint-equals-null-cocci'
2022-05-20 15:26:59 -07:00
revert.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
rm.c
rm: integrate with sparse-index
2022-08-08 13:23:26 -07:00
send-pack.c
i18n: factorize "invalid value" messages
2022-02-04 13:58:28 -08:00
shortlog.c
parse-options: add support for parsing subcommands
2022-08-19 11:13:14 -07:00
show-branch.c
Merge branch 'jc/show-branch-g-current' into maint
2022-06-08 14:27:51 -07:00
show-index.c
…
show-ref.c
builtin/show-ref.c: avoid over-iterating with --heads, --tags
2022-06-06 09:56:42 -07:00
sparse-checkout.c
pass subcommand "prefix" arguments to parse_options()
2022-08-25 09:43:29 -07:00
stash.c
builtin/stash.c: let parse-options parse subcommands
2022-08-19 11:13:16 -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
revisions API: don't leak memory on argv elements that need free()-ing
2022-08-03 11:12:36 -07:00
symbolic-ref.c
symbolic-ref: refuse to set syntactically invalid target
2022-08-01 12:17:13 -07:00
tag.c
Merge branch 'ep/maint-equals-null-cocci'
2022-05-20 15:26:59 -07:00
unpack-file.c
…
unpack-objects.c
unpack-objects: use stream_loose_object() to unpack large objects
2022-06-13 10:22:36 -07:00
update-index.c
Merge branch 'jh/builtin-fsmonitor-part3'
2022-06-10 15:04:15 -07:00
update-ref.c
…
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-pack.c
…
var.c
…
verify-commit.c
…
verify-pack.c
…
verify-tag.c
…
worktree.c
builtin/worktree.c: let parse-options parse subcommands
2022-08-19 11:13:16 -07:00
write-tree.c
…