summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)Author
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
2017-08-22Merge branch 'pw/am-signoff'Junio C Hamano
2017-08-22Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano
2017-08-08am: fix signoff when other trailers are presentPhillip Wood
2017-08-02am: remember --rerere-autoupdate settingPhillip Wood
2017-07-17sha1_name: convert get_sha1* to get_oid*brian m. carlson
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-19Merge branch 'bw/object-id'Junio C Hamano
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano
2017-06-05Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano
2017-06-05Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano
2017-06-04Merge branch 'js/plug-leaks' into maintJunio C Hamano
2017-06-04Merge branch 'jk/am-leakfix' into maintJunio C Hamano
2017-06-04Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano
2017-06-04Merge branch 'jk/unbreak-am-h'Junio C Hamano