summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ps/build-sign-compare'Junio C Hamano2024-12-231-0/+3
|\
| * global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt2024-12-061-0/+3
* | Merge branch 'jc/forbid-head-as-tagname'Junio C Hamano2024-12-161-1/+1
|\ \ | |/ |/|
| * refs: drop strbuf_ prefix from helpersJunio C Hamano2024-12-031-1/+1
* | builtin/merge: release output buffer after performing mergePatrick Steinhardt2024-11-051-0/+1
|/
* Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano2024-09-231-4/+8
|\
| * builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai2024-09-131-1/+2
| * builtin: add a repository parameter for builtin functionsJohn Cai2024-09-131-3/+6
* | environment: make `get_index_file()` accept a repositoryPatrick Steinhardt2024-09-121-6/+8
* | environment: make `get_git_dir()` accept a repositoryPatrick Steinhardt2024-09-121-1/+3
|/
* hooks: remove implicit dependency on `the_repository`Patrick Steinhardt2024-08-131-1/+1
* merge-recursive: honor diff.algorithmAntonin Delpeuch2024-07-141-1/+1
* Merge branch 'ps/leakfixes-more'Junio C Hamano2024-07-081-4/+14
|\
| * merge: fix leaking merge basesPatrick Steinhardt2024-06-111-0/+2
| * builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`Patrick Steinhardt2024-06-111-3/+7
| * commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt2024-06-111-1/+5
* | Merge branch 'ps/use-the-repository'Junio C Hamano2024-07-021-3/+4
|\ \
| * | hash: require hash algorithm in `empty_tree_oid_hex()`Patrick Steinhardt2024-06-141-1/+2
| * | hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt2024-06-141-2/+2
| |/
* | merge: avoid write merge state when unable to write indexKyle Zhao2024-06-181-1/+1
* | builtin/merge: always store allocated strings in `pull_twohead`Patrick Steinhardt2024-06-071-7/+11
|/
* config: clarify memory ownership in `git_config_string()`Patrick Steinhardt2024-05-271-2/+2
* Merge branch 'ps/refs-without-the-repository'Junio C Hamano2024-05-161-12/+22
|\
| * cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt2024-05-071-12/+22
* | builtin: stop using `the_index`Patrick Steinhardt2024-04-181-16/+15
|/
* Merge branch 'jk/core-comment-string'Junio C Hamano2024-04-051-6/+6
|\
| * prefer comment_line_str to comment_line_char for printingJeff King2024-03-121-2/+2
| * strbuf: accept a comment string for strbuf_commented_addf()Jeff King2024-03-121-4/+4
* | Merge branch 'eb/hash-transition'Junio C Hamano2024-03-281-1/+2
|\ \
| * | tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman2023-10-021-1/+2
* | | Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano2024-03-111-9/+17
|\ \ \ | |_|/ |/| |
| * | commit-reach(get_octopus_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-1/+5
| * | commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-8/+12
* | | Merge branch 'rs/use-xstrncmpz'Junio C Hamano2024-02-271-2/+1
|\ \ \ | |/ / |/| |
| * | use xstrncmpz()René Scharfe2024-02-121-2/+1
| * | Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano2024-02-091-4/+0
| |\ \
| * \ \ Merge branch 'la/trailer-cleanups' into maint-2.43Junio C Hamano2024-02-091-1/+1
| |\ \ \
* | | | | refs: convert MERGE_AUTOSTASH to become a normal pseudo-refPatrick Steinhardt2024-01-191-14/+13
* | | | | Merge branch 'en/header-cleanup'Junio C Hamano2024-01-081-4/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-4/+0
| |/ / /
* | | | Merge branch 'la/trailer-cleanups'Junio C Hamano2024-01-021-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | commit: ignore_non_trailer computes number of bytes to ignoreLinus Arver2023-10-201-1/+1
* | | Merge branch 'jk/commit-graph-leak-fixes'Junio C Hamano2023-10-131-1/+4
|\ \ \
| * | | merge: free result of repo_get_merge_bases()Jeff King2023-10-031-1/+4
* | | | diff --stat: set the width defaults in a helper functionDragan Simic2023-09-301-3/+1
|/ / /
* / / diff --stat: add config option to limit filename widthDragan Simic2023-09-181-0/+1
|/ /
* | merge: do not pass unused opt->value parameterJeff King2023-09-051-1/+1
* | parse-options: mark unused "opt" parameter in callbacksJeff King2023-09-051-1/+1
* | merge: simplify parsing of "-n" optionJeff King2023-09-011-11/+2
* | merge: make xopts a strvecJeff King2023-09-011-19/+7
|/
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 04:30:09 +0100