summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-5/+5
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-5/+5
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-4/+4
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-1/+1
* | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-8/+8
|\ \
| * | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-161-1/+1
| * | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-161-7/+7
| |/
* | apply: move lockfile into `apply_state`Martin Ågren2017-10-061-2/+1
* | treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-13/+11
|/
* am: release strbuf after use in safe_to_abort()Rene Scharfe2017-09-071-0/+1
* am: release strbuf on error return in hg_patch_to_mail()Rene Scharfe2017-09-071-10/+19
* am: release strbufs after use in detect_patch_format()Rene Scharfe2017-09-071-2/+2
* pack: move pack-closing functionsJonathan Tan2017-08-231-0/+1
* Merge branch 'pw/am-signoff'Junio C Hamano2017-08-221-25/+1
|\
| * am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-081-25/+1
| * Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-051-0/+3
| |\
| * \ Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-051-1/+1
| |\ \
| * \ \ Merge branch 'js/plug-leaks' into maintJunio C Hamano2017-06-041-9/+6
| |\ \ \
| * \ \ \ Merge branch 'jk/am-leakfix' into maintJunio C Hamano2017-06-041-20/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano2017-06-041-2/+3
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-221-0/+12
|\ \ \ \ \ \ \
| * | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-021-0/+12
* | | | | | | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-13/+5
|\ \ \ \ \ \ \
| * | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason2017-06-161-11/+4
| * | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | | | | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | builtin/notes: convert to struct object_idbrian m. carlson2017-06-021-1/+1
* | | | | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-6/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-261-6/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/unbreak-am-h'Junio C Hamano2017-06-041-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | am: handle "-h" argument earlierjk/unbreak-am-hJeff King2017-05-301-0/+3
| |/ / / / /
* | | | | | Merge branch 'ja/do-not-ask-needless-questions'Junio C Hamano2017-05-291-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | usability: don't ask questions if no reply is requiredJean-Noel Avila2017-05-121-2/+3
* | | | | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-9/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | get_mail_commit_oid(): avoid resource leakJohannes Schindelin2017-05-081-9/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-9/+9
|\ \ \ \ \
| * | | | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-3/+3
| * | | | | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-081-1/+1
| * | | | | revision: rename add_pending_sha1 to add_pending_oidbrian m. carlson2017-05-081-1/+1
| * | | | | Convert lookup_tree to struct object_idbrian m. carlson2017-05-081-2/+2
| * | | | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-2/+2
| |/ / / /
* | | | | Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano2017-05-231-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | am: check return value of resolve_refdup before using hashrs/checkout-am-fix-unbornRené Scharfe2017-05-081-1/+1
| | |/ / | |/| |
* | | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-161-2/+2
|\ \ \ \
| * | | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-271-1/+1
| * | | | parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-231-1/+1
* | | | | Merge branch 'jk/am-leakfix'Junio C Hamano2017-05-161-20/+14
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |