summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | am: shorten ident_split variable name in get_commit_info()jk/am-leakfixJeff King2017-04-271-11/+9
| * | | am: simplify allocations in get_commit_info()Jeff King2017-04-271-15/+10
| * | | am: fix commit buffer leak in get_commit_info()Jeff King2017-04-271-0/+1
* | | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-261-6/+4
|\ \ \ \
| * | | | am: drop "dir" parameter from am_state_initjk/war-on-git-pathJeff King2017-04-201-6/+4
| | |_|/ | |/| |
* | | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-261-21/+18
|\ \ \ \
| * | | | builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta2017-04-161-18/+15
| * | | | builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta2017-04-161-3/+3
| | |/ / | |/| |
* | | | Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano2017-04-231-2/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | am: close stream on error, but not stdinRené Scharfe2017-04-161-2/+6
| | |/ | |/|
* | | delete_ref: accept a reflog message argumentKyle Meyer2017-02-201-2/+2
|/ /
* | Merge branch 'sb/sequencer-abort-safety'Junio C Hamano2016-12-211-2/+2
|\ \ | |/
| * am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-081-1/+1
| * am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-081-1/+1
* | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-3/+3
|/
* Merge branch 'bc/object-id'Junio C Hamano2016-09-191-70/+70
|\
| * builtin/am: convert to struct object_idbrian m. carlson2016-09-071-70/+70
* | Merge branch 'cc/apply-am'Junio C Hamano2016-09-191-22/+43
|\ \
| * | builtin/am: use apply API in run_apply()cc/apply-amChristian Couder2016-09-071-22/+43
* | | Merge branch 'ah/misc-message-fixes'Junio C Hamano2016-09-151-1/+1
|\ \ \
| * | | am: put spaces around pipe in usage stringAlex Henrie2016-09-081-1/+1
| | |/ | |/|
* | | am: refactor read_author_script()jc/am-read-author-fileJunio C Hamano2016-08-301-58/+45
|/ /
* | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-101-40/+22
|\ \
| * | am -3: use merge_recursive() directly againJohannes Schindelin2016-07-261-40/+22
| |/
* | Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano2016-08-101-0/+2
|\ \ | |/ |/|
| * am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-011-0/+2