summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
2018-09-04Merge branch 'en/directory-renames-nothanks'Libravatar Junio C Hamano1-0/+1
2018-08-30am: avoid directory rename detection when calling recursive merge machineryLibravatar Elijah Newren1-0/+1
2018-08-13apply.c: make init_apply_state() take a struct repositoryLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'en/dirty-merge-fixes'Libravatar Junio C Hamano1-3/+4
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADLibravatar Elijah Newren1-3/+4
2018-07-03index_has_changes(): avoid assuming operating on the_indexLibravatar Elijah Newren1-3/+3
2018-06-29commit: add repository argument to lookup_commitLibravatar Stefan Beller1-1/+2
2018-06-29tree: add repository argument to lookup_treeLibravatar Stefan Beller1-2/+4
2018-06-25Merge branch 'nd/complete-config-vars'Libravatar Junio C Hamano1-5/+1
2018-06-01Merge branch 'nd/use-opt-int-set-f'Libravatar Junio C Hamano1-6/+6
2018-05-30Merge branch 'bc/object-id'Libravatar Junio C Hamano1-4/+4
2018-05-29am: move advice.amWorkDir parsing back to advice.cLibravatar Nguyễn Thái Ngọc Duy1-5/+1
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationLibravatar Nguyễn Thái Ngọc Duy1-6/+6
2018-05-06Replace all die("BUG: ...") calls by BUG() onesLibravatar Johannes Schindelin1-10/+10
2018-05-02builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algoLibravatar brian m. carlson1-4/+4
2018-04-11exec_cmd: rename to use dash in file nameLibravatar Stefan Beller1-1/+1
2018-04-11Merge branch 'sb/object-store'Libravatar Junio C Hamano1-1/+1
2018-03-26object-store: close all packs upon clearing the object storeLibravatar Stefan Beller1-1/+1
2018-03-14cache-tree: convert write_*_as_tree to object_idLibravatar brian m. carlson1-4/+4
2018-03-06Merge branch 'nd/rebase-show-current-patch'Libravatar Junio C Hamano1-4/+43
2018-02-28Merge branch 'nd/am-quit'Libravatar Junio C Hamano1-2/+10
2018-02-15Merge branch 'po/object-id'Libravatar Junio C Hamano1-2/+2
2018-02-14am: support --quitLibravatar Nguyễn Thái Ngọc Duy1-2/+10
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2018-02-12rebase: add --show-current-patchLibravatar Nguyễn Thái Ngọc Duy1-0/+11
2018-02-12am: add --show-current-patchLibravatar Nguyễn Thái Ngọc Duy1-4/+28
2018-01-30commit: convert commit_tree* to object_idLibravatar Patryk Obara1-2/+2
2018-01-16sq_quote_argv: drop maxlen parameterLibravatar Jeff King1-1/+1
2018-01-05Merge branch 'ew/empty-merge-with-dirty-index'Libravatar Junio C Hamano1-37/+0
2017-12-27Merge branch 'rs/am-builtin-leakfix'Libravatar Junio C Hamano1-3/+7
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano1-37/+0
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 11:20:06 +0000