aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
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-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
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-7/+7
2017-10-06apply: move lockfile into `apply_state`Martin Ågren1-2/+1
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-13/+11
2017-09-07am: release strbuf after use in safe_to_abort()Rene Scharfe1-0/+1
2017-09-07am: release strbuf on error return in hg_patch_to_mail()Rene Scharfe1-10/+19
2017-09-07am: release strbufs after use in detect_patch_format()Rene Scharfe1-2/+2
2017-08-23pack: move pack-closing functionsJonathan Tan1-0/+1
2017-08-22Merge branch 'pw/am-signoff'Junio C Hamano1-25/+1
2017-08-22Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano1-0/+12
2017-08-08am: fix signoff when other trailers are presentPhillip Wood1-25/+1
2017-08-02am: remember --rerere-autoupdate settingPhillip Wood1-0/+12
2017-07-17sha1_name: convert get_sha1* to get_oid*brian m. carlson1-3/+3
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-13/+5
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Junio C Hamano1-1/+1
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason1-11/+4
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano1-6/+2
2017-06-05Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano1-0/+3
2017-06-05Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano1-1/+1
2017-06-04Merge branch 'js/plug-leaks' into maintJunio C Hamano1-9/+6
2017-06-04Merge branch 'jk/am-leakfix' into maintJunio C Hamano1-20/+14
2017-06-04Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano1-2/+3
2017-06-04Merge branch 'jk/unbreak-am-h'Junio C Hamano1-0/+3
2017-06-02builtin/notes: convert to struct object_idbrian m. carlson1-1/+1
2017-05-30am: handle "-h" argument earlierJeff King1-0/+3
2017-05-29Merge branch 'ja/do-not-ask-needless-questions'Junio C Hamano1-2/+3
2017-05-29Merge branch 'js/plug-leaks'Junio C Hamano1-9/+6
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-9/+9
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy1-6/+2
2017-05-23Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano1-1/+1
2017-05-16Merge branch 'js/larger-timestamps'Junio C Hamano1-2/+2
2017-05-16Merge branch 'jk/am-leakfix'Junio C Hamano1-20/+14
2017-05-12usability: don't ask questions if no reply is requiredJean-Noel Avila1-2/+3
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson1-3/+3
2017-05-08diff-lib: convert do_diff_cache to struct object_idbrian m. carlson1-1/+1
2017-05-08revision: rename add_pending_sha1 to add_pending_oidbrian m. carlson1-1/+1
2017-05-08Convert lookup_tree to struct object_idbrian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-2/+2
2017-05-08get_mail_commit_oid(): avoid resource leakJohannes Schindelin1-9/+6
2017-05-08am: check return value of resolve_refdup before using hashRené Scharfe1-1/+1
2017-04-27am: shorten ident_split variable name in get_commit_info()Jeff King1-11/+9
2017-04-27am: simplify allocations in get_commit_info()Jeff King1-15/+10
2017-04-27am: fix commit buffer leak in get_commit_info()Jeff King1-0/+1
2017-04-27timestamp_t: a new data type for timestampsJohannes Schindelin1-1/+1
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano1-6/+4
2017-04-26Merge branch 'gb/rebase-signoff'Junio C Hamano1-21/+18
2017-04-23Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano1-2/+6
2017-04-23parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin1-1/+1
2017-04-20am: drop "dir" parameter from am_state_initJeff King1-6/+4
2017-04-16am: close stream on error, but not stdinRené Scharfe1-2/+6
2017-04-16builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta1-18/+15
2017-04-16builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta1-3/+3
2017-02-20delete_ref: accept a reflog message argumentKyle Meyer1-2/+2
2016-12-21Merge branch 'sb/sequencer-abort-safety'Junio C Hamano1-2/+2
2016-12-08am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer1-1/+1
2016-12-08am: fix filename in safe_to_abort() error messageStephan Beyer1-1/+1
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-3/+3
2016-09-19Merge branch 'bc/object-id'Junio C Hamano1-70/+70
2016-09-19Merge branch 'cc/apply-am'Junio C Hamano1-22/+43
2016-09-15Merge branch 'ah/misc-message-fixes'Junio C Hamano1-1/+1
2016-09-08am: put spaces around pipe in usage stringAlex Henrie1-1/+1
2016-09-07builtin/am: convert to struct object_idbrian m. carlson1-70/+70
2016-09-07builtin/am: use apply API in run_apply()Christian Couder1-22/+43
2016-08-30am: refactor read_author_script()Junio C Hamano1-58/+45
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano1-40/+22
2016-08-10Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano1-0/+2
2016-08-01am: reset cached ident date for each patchJeff King1-0/+2
2016-07-26am -3: use merge_recursive() directly againJohannes Schindelin1-40/+22
2016-07-19Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano1-8/+8
2016-07-19Merge branch 'jk/write-file'Junio C Hamano1-15/+10
2016-07-08am: counteract gender biasJohannes Schindelin1-8/+8
2016-07-08use write_file_buf where applicableJeff King1-6/+1
2016-07-08am: ignore return value of write_file()René Scharfe1-9/+9
2016-06-06am: support --patch-format=mboxrdEric Wong1-3/+11
2016-05-09builtin/am.c: use error_errno()Nguyễn Thái Ngọc Duy1-6/+5
2016-02-24Merge branch 'jc/am-i-v-fix'Junio C Hamano1-1/+1
2016-02-17am -i: fix "v"iewJunio C Hamano1-1/+1
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano1-1/+1
2016-01-28Merge branch 'jc/strbuf-getline'Junio C Hamano1-26/+11
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen1-1/+1
2016-01-15strbuf: give strbuf_getline() to the "most text friendly" variantJunio C Hamano1-4/+4
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano1-7/+7
2016-01-14strbuf: make strbuf_getline_crlf() globalJunio C Hamano1-15/+0
2016-01-13am: release pack files before garbage-collectingJohannes Schindelin1-0/+1
2015-11-20Convert struct object to object_idbrian m. carlson1-1/+1
2015-11-03Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano1-16/+33
2015-11-03Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano1-2/+2
2015-11-03Merge branch 'tk/stripspace' into maintJunio C Hamano1-1/+1
2015-10-29Merge branch 'jc/am-mailinfo-direct'Junio C Hamano1-19/+23
2015-10-26Merge branch 'tk/stripspace'Junio C Hamano1-1/+1
2015-10-26Merge branch 'rt/placeholder-in-usage'Junio C Hamano1-2/+2
2015-10-26Merge branch 'jc/am-3-fallback-regression-fix'Junio C Hamano1-16/+33
2015-10-21am: make direct call to mailinfoJunio C Hamano1-19/+23
2015-10-16Merge branch 'pt/am-builtin' into maintJunio C Hamano1-1/+12
2015-10-16am, credential-cache: add angle brackets to usage stringRalf Thielow1-2/+2
2015-10-16strbuf: make stripspace() part of strbufTobias Klauser1-1/+1
2015-10-15Merge branch 'pt/am-builtin'Junio C Hamano1-1/+12
2015-10-09am -3: do not let failed merge from completing the error codepathJunio C Hamano1-16/+33
2015-09-30am: configure gpg at startupRenee Margaret McConahy1-1/+12
2015-09-08Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano1-2/+29
2015-09-06am: match --signoff to the original scripted versionJunio C Hamano1-2/+29
2015-09-01rerere: release lockfile in non-writing functionsJeff King1-5/+0
2015-08-31Merge branch 'jc/am-state-fix'Junio C Hamano1-27/+41
2015-08-26Merge branch 'pt/am-builtin'Junio C Hamano1-1/+1
2015-08-26Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano1-13/+36
2015-08-26i18n: am: fix typo in description of -b optionJiang Xin1-1/+1
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano1-0/+1
2015-08-25write_file_v(): do not leave incomplete line at the endJunio C Hamano1-8/+2
2015-08-24write_file(): drop "fatal" parameterJunio C Hamano1-2/+2
2015-08-24builtin/am: make sure state files are textJunio C Hamano1-2/+8
2015-08-24builtin/am: introduce write_state_*() helper functionsJunio C Hamano1-27/+41
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan1-13/+36
2015-08-12am: let --signoff override --no-signoffPaul Tan1-3/+25
2015-08-12am: let command-line options override saved optionsPaul Tan1-4/+12
2015-08-04git-am: add am.threeWay config variableRemi Lespinet1-0/+2
2015-08-04builtin-am: remove redirection to git-am.shPaul Tan1-15/+0
2015-08-04builtin-am: check for valid committer identPaul Tan1-0/+3
2015-08-04builtin-am: implement legacy -b/--binary optionPaul Tan1-0/+7
2015-08-04builtin-am: implement -i/--interactivePaul Tan1-1/+104
2015-08-04builtin-am: support and auto-detect mercurial patchesPaul Tan1-1/+73
2015-08-04builtin-am: support and auto-detect StGit series filesPaul Tan1-1/+58
2015-08-04builtin-am: support and auto-detect StGit patchesPaul Tan1-1/+131
2015-08-04builtin-am: rerere supportPaul Tan1-0/+25
2015-08-04builtin-am: invoke post-applypatch hookPaul Tan1-0/+2
2015-08-04builtin-am: invoke pre-applypatch hookPaul Tan1-0/+3
2015-08-04builtin-am: invoke applypatch-msg hookPaul Tan1-0/+24
2015-08-04builtin-am: support automatic notes copyingPaul Tan1-0/+60
2015-08-04builtin-am: invoke post-rewrite hookPaul Tan1-0/+55
2015-08-04builtin-am: implement -S/--gpg-sign, commit.gpgsignPaul Tan1-1/+10
2015-08-04builtin-am: implement --committer-date-is-author-datePaul Tan1-0/+8
2015-08-04builtin-am: implement --ignore-datePaul Tan1-1/+5
2015-08-04builtin-am: pass git-apply's options to git-applyPaul Tan1-0/+45
2015-08-04builtin-am: implement --[no-]scissorsPaul Tan1-0/+48
2015-08-04builtin-am: support --keep-cr, am.keepcrPaul Tan1-6/+23
2015-08-04builtin-am: implement --[no-]message-id, am.messageidPaul Tan1-0/+13
2015-08-04builtin-am: implement -k/--keep, --keep-non-patchPaul Tan1-0/+50
2015-08-04builtin-am: implement -u/--utf8Paul Tan1-0/+11
2015-08-04builtin-am: handle stray state directoryPaul Tan1-0/+17
2015-08-04builtin-am: bypass git-mailinfo when --rebasingPaul Tan1-1/+133
2015-08-04builtin-am: implement --rebasing modePaul Tan1-4/+26
2015-08-04builtin-am: implement --3wayPaul Tan1-4/+150
2015-08-04builtin-am: implement -s/--signoffPaul Tan1-0/+12
2015-08-04builtin-am: exit with user friendly message on failurePaul Tan1-4/+26
2015-08-04builtin-am: implement -q/--quietPaul Tan1-3/+28
2015-08-04builtin-am: reject patches when there's a session in progressPaul Tan1-0/+15
2015-08-04builtin-am: implement --abortPaul Tan1-3/+100
2015-08-04builtin-am: implement --skipPaul Tan1-2/+121
2015-08-04builtin-am: don't parse mail when resumingPaul Tan1-9/+25
2015-08-04builtin-am: implement --resolved/--continuePaul Tan1-1/+71
2015-08-04builtin-am: refuse to apply patches if index is dirtyPaul Tan1-0/+45
2015-08-04builtin-am: implement committing applied patchPaul Tan1-4/+51
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-08 11:09:03 +0000