aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/am.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ps/leakfixes-more' into jchJunio C Hamano19 hours1-3/+4
|\
| * commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt19 hours1-0/+1
| * builtin/merge-recursive: fix leaking object ID basesPatrick Steinhardt19 hours1-3/+3
* | Merge branch 'jk/am-retry' into jchJunio C Hamano45 hours1-0/+3
|\ \ | |/ |/|
| * am: add explicit "--retry" optionJeff King6 days1-0/+3
* | Merge branch 'ps/refs-without-the-repository'Junio C Hamano2024-05-161-14/+24
|\ \
| * | cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt2024-05-071-14/+24
* | | builtin: stop using `the_index`Patrick Steinhardt2024-04-181-18/+18
|/ /
* | Merge branch 'jk/core-comment-string'Junio C Hamano2024-04-051-1/+1
|\ \
| * | strbuf: accept a comment string for strbuf_stripspace()Jeff King2024-03-121-1/+1
| |/
* | Merge branch 'pb/advice-merge-conflict'Junio C Hamano2024-04-011-5/+9
|\ \
| * | builtin/am: allow disabling conflict advicePhilippe Blain2024-03-181-5/+9
| |/
* | Merge branch 'eb/hash-transition'Junio C Hamano2024-03-281-3/+3
|\ \ | |/ |/|
| * tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman2023-10-021-3/+3
* | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-4/+0
* | Merge branch 'rs/fix-arghelp'Junio C Hamano2023-11-071-1/+1
|\ \
| * | am, rebase: fix arghelp syntax of --emptyRené Scharfe2023-10-291-1/+1
| |/
* | am: simplify --show-current-patch handlingRené Scharfe2023-10-291-68/+44
* | Merge branch 'ob/am-msgfix'Junio C Hamano2023-09-291-1/+2
|\ \
| * | am: fix error message in parse_opt_show_current_patch()Oswald Buddenhagen2023-09-211-1/+2
| |/
* / diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()Junio C Hamano2023-08-211-2/+2
|/
* Merge branch 'jc/am-parseopt-fix'Junio C Hamano2023-07-261-6/+3
|\
| * am: simplify parsing of "--[no-]keep-cr"Junio C Hamano2023-07-181-6/+3
* | Merge branch 'jk/unused-parameter'Junio C Hamano2023-07-251-2/+2
|\ \
| * | am: mark unused keep_cr parametersJeff King2023-07-131-2/+2
* | | Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-1/+0
|\ \ \ | |/ / |/| |
| * | treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | | Merge branch 'cw/strbuf-cleanup'Junio C Hamano2023-07-061-1/+1
|\ \ \ | |/ / |/| |
| * | strbuf: remove global variableCalvin Wan2023-06-121-1/+1
| |/
* | repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
* | cache.h: remove this no-longer-used headerElijah Newren2023-06-211-2/+1
* | preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren2023-06-211-0/+1
|/
* pager.h: move declarations for pager.c functions from cache.hElijah Newren2023-04-111-0/+1
* editor: move editor-related functions and declarations into common fileElijah Newren2023-04-111-0/+1
* object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* treewide: be explicit about dependence on advice.hElijah Newren2023-04-111-0/+1
* Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-hJunio C Hamano2023-04-041-11/+12
|\
| * cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+4
| * cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-8/+8
* | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
* | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
* | abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
* | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | Merge branch 'jc/gpg-lazy-init'Junio C Hamano2023-03-171-12/+1
|\ \
| * | drop pure pass-through config callbacksJeff King2023-02-271-6/+1
| * | gpg-interface: lazily initialize and read the configurationJunio C Hamano2023-02-091-6/+0
* | | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
| |/ |/|
* | Merge branch 'ab/hook-api-with-stdin'Junio C Hamano2023-02-221-16/+4
|\ \
| * | hook API: support passing stdin to hooks, convert am's 'post-rewrite'Emily Shaffer2023-02-081-16/+4
| |/
* / cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason2023-02-101-3/+3
|/
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.