summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
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
2017-05-08Convert lookup_tree to struct object_idLibravatar brian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idLibravatar brian m. carlson1-2/+2
2017-05-08get_mail_commit_oid(): avoid resource leakLibravatar Johannes Schindelin1-9/+6
2017-05-08am: check return value of resolve_refdup before using hashLibravatar René Scharfe1-1/+1
2017-04-27am: shorten ident_split variable name in get_commit_info()Libravatar Jeff King1-11/+9
2017-04-27am: simplify allocations in get_commit_info()Libravatar Jeff King1-15/+10
2017-04-27am: fix commit buffer leak in get_commit_info()Libravatar Jeff King1-0/+1
2017-04-27timestamp_t: a new data type for timestampsLibravatar Johannes Schindelin1-1/+1
2017-04-26Merge branch 'jk/war-on-git-path'Libravatar Junio C Hamano1-6/+4
2017-04-26Merge branch 'gb/rebase-signoff'Libravatar Junio C Hamano1-21/+18
2017-04-23Merge branch 'rs/misc-cppcheck-fixes'Libravatar Junio C Hamano1-2/+6
2017-04-23parse_timestamp(): specify explicitly where we parse timestampsLibravatar Johannes Schindelin1-1/+1
2017-04-20am: drop "dir" parameter from am_state_initLibravatar Jeff King1-6/+4
2017-04-16am: close stream on error, but not stdinLibravatar René Scharfe1-2/+6
2017-04-16builtin/am: fold am_signoff() into am_append_signoff()Libravatar Giuseppe Bilotta1-18/+15
2017-04-16builtin/am: honor --signoff also when --rebasingLibravatar Giuseppe Bilotta1-3/+3
2017-02-20delete_ref: accept a reflog message argumentLibravatar Kyle Meyer1-2/+2
2016-12-21Merge branch 'sb/sequencer-abort-safety'Libravatar Junio C Hamano1-2/+2
2016-12-08am: change safe_to_abort()'s not rewinding error into a warningLibravatar Stephan Beyer1-1/+1
2016-12-08am: fix filename in safe_to_abort() error messageLibravatar Stephan Beyer1-1/+1
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Libravatar Junio C Hamano1-3/+3
2016-09-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-70/+70
2016-09-19Merge branch 'cc/apply-am'Libravatar Junio C Hamano1-22/+43
2016-09-15Merge branch 'ah/misc-message-fixes'Libravatar Junio C Hamano1-1/+1
2016-09-08am: put spaces around pipe in usage stringLibravatar Alex Henrie1-1/+1
2016-09-07builtin/am: convert to struct object_idLibravatar brian m. carlson1-70/+70
2016-09-07builtin/am: use apply API in run_apply()Libravatar Christian Couder1-22/+43
2016-08-30am: refactor read_author_script()Libravatar Junio C Hamano1-58/+45
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Libravatar Junio C Hamano1-40/+22
2016-08-10Merge branch 'jk/reset-ident-time-per-commit'Libravatar Junio C Hamano1-0/+2
2016-08-01am: reset cached ident date for each patchLibravatar Jeff King1-0/+2
2016-07-26am -3: use merge_recursive() directly againLibravatar Johannes Schindelin1-40/+22
2016-07-19Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Libravatar Junio C Hamano1-8/+8
2016-07-19Merge branch 'jk/write-file'Libravatar Junio C Hamano1-15/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:57:20 +0000