summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)Author
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano
2024-04-01Merge branch 'pb/advice-merge-conflict'Junio C Hamano
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano
2024-03-18builtin/am: allow disabling conflict advicePhilippe Blain
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-11-07Merge branch 'rs/fix-arghelp'Junio C Hamano
2023-10-29am, rebase: fix arghelp syntax of --emptyRené Scharfe
2023-10-29am: simplify --show-current-patch handlingRené Scharfe
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman
2023-09-29Merge branch 'ob/am-msgfix'Junio C Hamano
2023-09-21am: fix error message in parse_opt_show_current_patch()Oswald Buddenhagen
2023-08-21diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()Junio C Hamano
2023-07-26Merge branch 'jc/am-parseopt-fix'Junio C Hamano
2023-07-25Merge branch 'jk/unused-parameter'Junio C Hamano
2023-07-18am: simplify parsing of "--[no-]keep-cr"Junio C Hamano
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano
2023-07-14am: mark unused keep_cr parametersJeff King
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan
2023-06-21repository: remove unnecessary include of path.hElijah Newren
2023-06-21cache.h: remove this no-longer-used headerElijah Newren
2023-06-21preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren
2023-06-12strbuf: remove global variableCalvin Wan
2023-04-11pager.h: move declarations for pager.c functions from cache.hElijah Newren
2023-04-11editor: move editor-related functions and declarations into common fileElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano
2023-02-27drop pure pass-through config callbacksJeff King
2023-02-24cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2023-02-22Merge branch 'ab/hook-api-with-stdin'Junio C Hamano
2023-02-10cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason
2023-02-10gpg-interface: lazily initialize and read the configurationJunio C Hamano
2023-02-08hook API: support passing stdin to hooks, convert am's 'post-rewrite'Emily Shaffer
2023-01-22Merge branch 'rs/dup-array'Junio C Hamano
2023-01-16Merge branch 'tr/am--no-verify'Junio C Hamano
2023-01-09use DUP_ARRAYRené Scharfe
2023-01-05am: allow passing --no-verify flagThierry Reding
2022-12-26Merge branch 'rs/am-parse-options-cleanup'Junio C Hamano
2022-12-13am: don't pass strvec to apply_parse_options()René Scharfe
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason