summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)Author
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano
2018-08-30am: avoid directory rename detection when calling recursive merge machineryElijah Newren
2018-08-13apply.c: make init_apply_state() take a struct repositoryNguyễn Thái Ngọc Duy
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADElijah Newren
2018-07-03index_has_changes(): avoid assuming operating on the_indexElijah Newren
2018-06-29commit: add repository argument to lookup_commitStefan Beller
2018-06-29tree: add repository argument to lookup_treeStefan Beller
2018-06-25Merge branch 'nd/complete-config-vars'Junio C Hamano
2018-06-01Merge branch 'nd/use-opt-int-set-f'Junio C Hamano
2018-05-30Merge branch 'bc/object-id'Junio C Hamano
2018-05-29am: move advice.amWorkDir parsing back to advice.cNguyễn Thái Ngọc Duy
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin
2018-05-02builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algobrian m. carlson
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller
2018-04-11Merge branch 'sb/object-store'Junio C Hamano
2018-03-26object-store: close all packs upon clearing the object storeStefan Beller
2018-03-14cache-tree: convert write_*_as_tree to object_idbrian m. carlson
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano
2018-02-28Merge branch 'nd/am-quit'Junio C Hamano
2018-02-15Merge branch 'po/object-id'Junio C Hamano
2018-02-14am: support --quitNguyễn Thái Ngọc Duy
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy
2018-02-12am: add --show-current-patchNguyễn Thái Ngọc Duy
2018-01-30commit: convert commit_tree* to object_idPatryk Obara
2018-01-16sq_quote_argv: drop maxlen parameterJeff King
2018-01-05Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano
2017-12-27Merge branch 'rs/am-builtin-leakfix'Junio C Hamano
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano
2017-12-07am: release strbuf after use in split_mail_mbox()René Scharfe
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano
2017-11-06Merge branch 'bc/object-id'Junio C Hamano
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson
2017-10-06apply: move lockfile into `apply_state`Martin Ågren
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren
2017-09-06am: release strbuf after use in safe_to_abort()Rene Scharfe
2017-09-06am: release strbuf on error return in hg_patch_to_mail()Rene Scharfe
2017-09-06am: release strbufs after use in detect_patch_format()Rene Scharfe
2017-08-23pack: move pack-closing functionsJonathan Tan