aboutsummaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAge
* Merge branch 'bc/object-id'Junio C Hamano2017-05-23
|\
| * tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-08
| * diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-08
| * revision: rename add_pending_sha1 to add_pending_oidbrian m. carlson2017-05-08
| * Convert lookup_tree to struct object_idbrian m. carlson2017-05-08
| * Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
* | Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano2017-05-23
|\ \
| * | am: check return value of resolve_refdup before using hashRené Scharfe2017-05-08
* | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-16
|\ \ \
| * | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-27
| * | | parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-23
* | | | Merge branch 'jk/am-leakfix'Junio C Hamano2017-05-16
|\ \ \ \ | |_|_|/ |/| | |
| * | | am: shorten ident_split variable name in get_commit_info()Jeff King2017-04-27
| * | | am: simplify allocations in get_commit_info()Jeff King2017-04-27
| * | | am: fix commit buffer leak in get_commit_info()Jeff King2017-04-27
* | | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-26
|\ \ \ \
| * | | | am: drop "dir" parameter from am_state_initJeff King2017-04-20
| | |_|/ | |/| |
* | | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-26
|\ \ \ \
| * | | | builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta2017-04-16
| * | | | builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta2017-04-16
| | |/ / | |/| |
* | | | Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano2017-04-23
|\ \ \ \ | |_|_|/ |/| | |
| * | | am: close stream on error, but not stdinRené Scharfe2017-04-16
| | |/ | |/|
* | | delete_ref: accept a reflog message argumentKyle Meyer2017-02-20
|/ /
* | Merge branch 'sb/sequencer-abort-safety'Junio C Hamano2016-12-21
|\ \ | |/
| * am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-08
| * am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-08
* | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-07
|/
* Merge branch 'bc/object-id'Junio C Hamano2016-09-19
|\
| * builtin/am: convert to struct object_idbrian m. carlson2016-09-07
* | Merge branch 'cc/apply-am'Junio C Hamano2016-09-19
|\ \
| * | builtin/am: use apply API in run_apply()Christian Couder2016-09-07
* | | Merge branch 'ah/misc-message-fixes'Junio C Hamano2016-09-15
|\ \ \
| * | | am: put spaces around pipe in usage stringAlex Henrie2016-09-08
| | |/ | |/|
* | | am: refactor read_author_script()Junio C Hamano2016-08-30
|/ /
* | Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano2016-08-10
|\ \
| * | am -3: use merge_recursive() directly againJohannes Schindelin2016-07-26
| |/
* | Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano2016-08-10
|\ \ | |/ |/|
| * am: reset cached ident date for each patchJeff King2016-08-01
* | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano2016-07-19
|\ \
| * | am: counteract gender biasJohannes Schindelin2016-07-08
| |/
* | Merge branch 'jk/write-file'Junio C Hamano2016-07-19
|\ \
| * | use write_file_buf where applicableJeff King2016-07-08
| * | am: ignore return value of write_file()René Scharfe2016-07-08
* | | am: support --patch-format=mboxrdEric Wong2016-06-06
|/ /
* | builtin/am.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-09
|/
* Merge branch 'jc/am-i-v-fix'Junio C Hamano2016-02-24
|\
| * am -i: fix "v"iewJunio C Hamano2016-02-17
* | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-03
|\ \
| * | diff: make -O and --output work in subdirectoryDuy Nguyen2016-01-21
| * | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-03
| |\ \