summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseLibravatar Elijah Newren1-37/+0
2017-12-13Merge branch 'bc/hash-algo'Libravatar Junio C Hamano1-1/+1
2017-12-07am: release strbuf after use in split_mail_mbox()Libravatar René Scharfe1-3/+7
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Libravatar Junio C Hamano1-1/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionLibravatar brian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-5/+5
2017-11-06Merge branch 'bc/object-id'Libravatar Junio C Hamano1-8/+8
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Libravatar Michael Haggerty1-1/+1
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-5/+5
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-4/+4
2017-11-01diff: remove DIFF_OPT_TST macroLibravatar Brandon Williams1-1/+1
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idLibravatar brian m. carlson1-7/+7
2017-10-06apply: move lockfile into `apply_state`Libravatar Martin Ågren1-2/+1
2017-10-06treewide: prefer lockfiles on the stackLibravatar Martin Ågren1-13/+11
2017-09-07am: release strbuf after use in safe_to_abort()Libravatar Rene Scharfe1-0/+1
2017-09-07am: release strbuf on error return in hg_patch_to_mail()Libravatar Rene Scharfe1-10/+19
2017-09-07am: release strbufs after use in detect_patch_format()Libravatar Rene Scharfe1-2/+2
2017-08-23pack: move pack-closing functionsLibravatar Jonathan Tan1-0/+1
2017-08-22Merge branch 'pw/am-signoff'Libravatar Junio C Hamano1-25/+1
2017-08-22Merge branch 'pw/sequence-rerere-autoupdate'Libravatar Junio C Hamano1-0/+12
2017-08-08am: fix signoff when other trailers are presentLibravatar Phillip Wood1-25/+1
2017-08-02am: remember --rerere-autoupdate settingLibravatar Phillip Wood1-0/+12
2017-07-17sha1_name: convert get_sha1* to get_oid*Libravatar brian m. carlson1-3/+3
2017-06-24Merge branch 'ab/free-and-null'Libravatar Junio C Hamano1-13/+5
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Libravatar Junio C Hamano1-1/+1
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroLibravatar Ævar Arnfjörð Bjarmason1-11/+4
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleLibravatar Ævar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Libravatar Junio C Hamano1-6/+2
2017-06-05Merge branch 'jk/unbreak-am-h' into maintLibravatar Junio C Hamano1-0/+3
2017-06-05Merge branch 'rs/checkout-am-fix-unborn' into maintLibravatar Junio C Hamano1-1/+1
2017-06-04Merge branch 'js/plug-leaks' into maintLibravatar Junio C Hamano1-9/+6
2017-06-04Merge branch 'jk/am-leakfix' into maintLibravatar Junio C Hamano1-20/+14
2017-06-04Merge branch 'ja/do-not-ask-needless-questions' into maintLibravatar Junio C Hamano1-2/+3
2017-06-04Merge branch 'jk/unbreak-am-h'Libravatar Junio C Hamano1-0/+3
2017-06-02builtin/notes: convert to struct object_idLibravatar brian m. carlson1-1/+1
2017-05-30am: handle "-h" argument earlierLibravatar Jeff King1-0/+3
2017-05-29Merge branch 'ja/do-not-ask-needless-questions'Libravatar Junio C Hamano1-2/+3
2017-05-29Merge branch 'js/plug-leaks'Libravatar Junio C Hamano1-9/+6
2017-05-29Merge branch 'bc/object-id'Libravatar Junio C Hamano1-9/+9
2017-05-26use xfopen() in more placesLibravatar Nguyễn Thái Ngọc Duy1-6/+2
2017-05-23Merge branch 'rs/checkout-am-fix-unborn'Libravatar Junio C Hamano1-1/+1
2017-05-16Merge branch 'js/larger-timestamps'Libravatar Junio C Hamano1-2/+2
2017-05-16Merge branch 'jk/am-leakfix'Libravatar Junio C Hamano1-20/+14
2017-05-12usability: don't ask questions if no reply is requiredLibravatar Jean-Noel Avila1-2/+3
2017-05-08tree: convert parse_tree_indirect to struct object_idLibravatar brian m. carlson1-3/+3
2017-05-08diff-lib: convert do_diff_cache to struct object_idLibravatar brian m. carlson1-1/+1
2017-05-08revision: rename add_pending_sha1 to add_pending_oidLibravatar brian m. carlson1-1/+1