aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
4 daysMerge branch 'ps/refs-without-the-repository'Junio C Hamano1-14/+24
13 dayscocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-14/+24
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-18/+18
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano1-1/+1
2024-04-01Merge branch 'pb/advice-merge-conflict'Junio C Hamano1-5/+9
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-3/+3
2024-03-18builtin/am: allow disabling conflict advicePhilippe Blain1-5/+9
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King1-1/+1
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-4/+0
2023-11-07Merge branch 'rs/fix-arghelp'Junio C Hamano1-1/+1
2023-10-29am, rebase: fix arghelp syntax of --emptyRené Scharfe1-1/+1
2023-10-29am: simplify --show-current-patch handlingRené Scharfe1-68/+44
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-3/+3
2023-09-29Merge branch 'ob/am-msgfix'Junio C Hamano1-1/+2
2023-09-21am: fix error message in parse_opt_show_current_patch()Oswald Buddenhagen1-1/+2
2023-08-21diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()Junio C Hamano1-2/+2
2023-07-26Merge branch 'jc/am-parseopt-fix'Junio C Hamano1-6/+3
2023-07-25Merge branch 'jk/unused-parameter'Junio C Hamano1-2/+2
2023-07-18am: simplify parsing of "--[no-]keep-cr"Junio C Hamano1-6/+3
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-1/+0
2023-07-13am: mark unused keep_cr parametersJeff King1-2/+2
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-1/+1
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-2/+1
2023-06-21preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren1-0/+1
2023-06-12strbuf: remove global variableCalvin Wan1-1/+1
2023-04-11pager.h: move declarations for pager.c functions from cache.hElijah Newren1-0/+1
2023-04-11editor: move editor-related functions and declarations into common fileElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-11/+12
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+4
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-8/+8
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren1-0/+1
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano1-12/+1
2023-02-27drop pure pass-through config callbacksJeff King1-6/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-22Merge branch 'ab/hook-api-with-stdin'Junio C Hamano1-16/+4
2023-02-10cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason1-3/+3
2023-02-09gpg-interface: lazily initialize and read the configurationJunio C Hamano1-6/+0
2023-02-08hook API: support passing stdin to hooks, convert am's 'post-rewrite'Emily Shaffer1-16/+4
2023-01-21Merge branch 'rs/dup-array'Junio C Hamano1-2/+1
2023-01-16Merge branch 'tr/am--no-verify'Junio C Hamano1-3/+8
2023-01-09use DUP_ARRAYRené Scharfe1-2/+1
2023-01-05am: allow passing --no-verify flagThierry Reding1-3/+8
2022-12-26Merge branch 'rs/am-parse-options-cleanup'Junio C Hamano1-1/+11
2022-12-13am: don't pass strvec to apply_parse_options()René Scharfe1-1/+11
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-10/+11
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason1-2/+2
2022-10-30replace and remove run_command_v_opt()René Scharfe1-4/+5
2022-10-30am: simplify building "show" argument listRené Scharfe1-7/+4
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-1/+1
2022-08-19config: mark unused callback parametersJeff King1-1/+1
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason1-0/+3
2022-02-25Merge branch 'ab/date-mode-release'Junio C Hamano1-0/+1
2022-02-25Merge branch 'ja/i18n-common-messages'Junio C Hamano1-3/+5
2022-02-16date API: create a date.h, split from cache.hÆvar Arnfjörð Bjarmason1-0/+1
2022-02-09Merge branch 'ab/config-based-hooks-2'Junio C Hamano1-3/+3
2022-02-04i18n: factorize "invalid value" messagesJean-Noël Avila1-3/+5
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-3/+3
2022-01-07am: convert applypatch-msg to use hook.hEmily Shaffer1-1/+1
2022-01-07am: convert {pre,post}-applypatch to use hook.hEmily Shaffer1-2/+2
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila1-3/+3
2021-12-15am: support --allow-empty to record specific empty patches徐沛文 (Aleen)1-8/+24
2021-12-15am: support --empty=<option> to handle empty patches徐沛文 (Aleen)1-5/+52
2021-10-13Merge branch 'ab/config-based-hooks-1'Junio C Hamano1-0/+1
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano1-1/+2
2021-09-27Change unpack_trees' 'reset' flag into an enumElijah Newren1-3/+2
2021-09-27Remove ignored files by default when they are in the wayElijah Newren1-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-0/+3
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason1-0/+1
2021-09-23Merge branch 'en/am-abort-fix'Junio C Hamano1-1/+2
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano1-1/+0
2021-09-20Merge branch 'en/am-abort-fix' into en/removing-untracked-fixesJunio C Hamano1-1/+2
2021-09-10am: fix incorrect exit status on am fail to abortElijah Newren1-1/+2
2021-09-09run_auto_maintenance(): implicitly close the object storeJohannes Schindelin1-1/+0
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-1/+1
2021-07-13*.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason1-0/+1
2021-05-10am: learn to process quoted lines that ends with CRLFĐoàn Trần Công Danh1-0/+51
2021-01-06builtin/*: update usage formatZheNing Hu1-2/+2
2020-11-09Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano1-16/+3
2020-11-02Merge branch 'bk/sob-dco'Junio C Hamano1-1/+1
2020-10-26Merge branch 'jk/committer-date-is-author-date-fix'Junio C Hamano1-2/+2
2020-10-26am, sequencer: stop parsing our own committer identJeff King1-16/+3
2020-10-23am: fix broken email with --committer-date-is-author-dateJeff King1-2/+2
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn1-1/+1
2020-09-30assert PARSE_OPT_NONEG in parse-options callbacksJeff King1-0/+2
2020-09-25Merge branch 'ds/maintenance-part-1'Junio C Hamano1-1/+1
2020-09-17maintenance: replace run_auto_gc()Derrick Stolee1-1/+1
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano1-6/+24
2020-08-17am: stop exporting GIT_COMMITTER_DATEPhillip Wood1-6/+24
2020-07-30strvec: rename struct fieldsJeff King1-8/+8
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King1-33/+33
2020-07-28quote: rename sq_dequote_to_argv_array to mention strvecJeff King1-1/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano1-2/+1
2020-02-20am: support --show-current-patch=diff to retrieve .git/rebase-apply/patchPaolo Bonzini1-2/+7
2020-02-20am: support --show-current-patch=raw as a synonym for--show-current-patchPaolo Bonzini1-6/+53
2020-02-20am: convert "resume" variable to a structPaolo Bonzini1-14/+18
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-1/+1
2019-10-11Merge branch 'rs/dedup-includes'Junio C Hamano1-1/+0
2019-10-07Merge branch 'tg/stash-refresh-index'Junio C Hamano1-14/+2
2019-10-04treewide: remove duplicate #include directivesRené Scharfe1-1/+0
2019-09-20factor out refresh_and_write_cache functionThomas Gummerer1-14/+2
2019-09-06git-am: handle missing "author" when parsing commitJeff King1-1/+3
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee1-1/+1
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-1/+1
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano1-1/+1
2019-06-17Merge branch 'jk/am-i-resolved-fix'Junio C Hamano1-11/+12
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee1-1/+1
2019-05-28am: fix --interactive HEAD tree resolutionJeff King1-3/+4
2019-05-28am: drop tty requirement for --interactiveJeff King1-3/+3
2019-05-28am: read interactive input from stdinJeff King1-2/+4
2019-05-28am: simplify prompt response handlingJeff King1-3/+1
2019-04-25Merge branch 'bc/hash-transition-16'Junio C Hamano1-4/+5
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano1-2/+2
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy1-1/+1
2019-04-01builtin/am: make hash size independentbrian m. carlson1-4/+5
2019-03-24am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy1-2/+2
2019-03-07Merge branch 'nd/completion-more-parameters'Junio C Hamano1-0/+4
2019-03-07Merge branch 'jh/trace2'Junio C Hamano1-0/+1
2019-03-07Merge branch 'wh/author-committer-ident-config'Junio C Hamano1-0/+1
2019-02-22trace2:data: add trace2 hook classificationJeff Hostetler1-0/+1
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+4
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-6/+7
2019-02-06Merge branch 'tt/bisect-in-c'Junio C Hamano1-18/+2
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano1-0/+9
2019-02-04config: allow giving separate author and committer identsWilliam Hubbs1-0/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2019-01-14read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy1-3/+3
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-2/+2
2019-01-02wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()Pranit Bauva1-18/+2
2018-12-28am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren1-0/+9
2018-11-18Merge branch 'jk/unused-parameter-fixes'Junio C Hamano1-1/+3
2018-11-13Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano1-56/+4
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-1/+1
2018-11-12branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy1-1/+1
2018-11-06am: handle --no-patch-format optionJeff King1-1/+3
2018-11-01add read_author_script() to libgitPhillip Wood1-84/+2
2018-11-01am: rename read_author_script()Phillip Wood1-2/+2
2018-11-01am: improve author-script error reportingPhillip Wood1-10/+39
2018-11-01am: don't die in read_author_script()Phillip Wood1-1/+2
2018-10-19Merge branch 'nd/status-refresh-progress'Junio C Hamano1-1/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-5/+5
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+3
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2018-09-17Merge branch 'rs/mailinfo-format-flowed'Junio C Hamano1-0/+4
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-1/+1
2018-09-17status: show progress bar if refreshing the index takes too longNguyễn Thái Ngọc Duy1-1/+1
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano1-0/+1
2018-08-30am: avoid directory rename detection when calling recursive merge machineryElijah Newren1-0/+1
2018-08-29mailinfo: support format=flowedRené Scharfe1-0/+4
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-08-13apply.c: make init_apply_state() take a struct repositoryNguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano1-3/+4
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADElijah Newren1-3/+4
2018-07-03index_has_changes(): avoid assuming operating on the_indexElijah Newren1-3/+3
2018-06-29commit: add repository argument to lookup_commitStefan Beller1-1/+2
2018-06-29tree: add repository argument to lookup_treeStefan Beller1-2/+4
2018-06-25Merge branch 'nd/complete-config-vars'Junio C Hamano1-5/+1
2018-06-01Merge branch 'nd/use-opt-int-set-f'Junio C Hamano1-6/+6
2018-05-30Merge branch 'bc/object-id'Junio C Hamano1-4/+4
2018-05-29am: move advice.amWorkDir parsing back to advice.cNguyễn Thái Ngọc Duy1-5/+1
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy1-6/+6
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-10/+10
2018-05-02builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algobrian m. carlson1-4/+4
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller1-1/+1
2018-04-11Merge branch 'sb/object-store'Junio C Hamano1-1/+1
2018-03-26object-store: close all packs upon clearing the object storeStefan Beller1-1/+1
2018-03-14cache-tree: convert write_*_as_tree to object_idbrian m. carlson1-4/+4
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano1-4/+43
2018-02-28Merge branch 'nd/am-quit'Junio C Hamano1-2/+10
2018-02-15Merge branch 'po/object-id'Junio C Hamano1-2/+2
2018-02-14am: support --quitNguyễn Thái Ngọc Duy1-2/+10
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy1-0/+4
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy1-0/+11
2018-02-12am: add --show-current-patchNguyễn Thái Ngọc Duy1-4/+28
2018-01-30commit: convert commit_tree* to object_idPatryk Obara1-2/+2
2018-01-16sq_quote_argv: drop maxlen parameterJeff King1-1/+1
2018-01-05Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano1-37/+0
2017-12-27Merge branch 'rs/am-builtin-leakfix'Junio C Hamano1-3/+7
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano1-37/+0
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren1-37/+0
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-12-07am: release strbuf after use in split_mail_mbox()René Scharfe1-3/+7
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano1-1/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-5/+5
2017-11-06Merge branch 'bc/object-id'Junio C Hamano1-8/+8
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty1-1/+1
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-5/+5
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-4/+4
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams1-1/+1
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson1-1/+1
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 15:57:03 +0000