summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano2016-07-191-8/+8
|\ \
| * | am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3wayJohannes Schindelin2016-07-081-8/+8
| |/
* | Merge branch 'jk/write-file'Junio C Hamano2016-07-191-15/+10
|\ \
| * | use write_file_buf where applicableJeff King2016-07-081-6/+1
| * | am: ignore return value of write_file()René Scharfe2016-07-081-9/+9
* | | am: support --patch-format=mboxrdew/mboxrd-format-amEric Wong2016-06-061-3/+11
|/ /
* | builtin/am.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-6/+5
|/
* Merge branch 'jc/am-i-v-fix'Junio C Hamano2016-02-241-1/+1
|\
| * am -i: fix "v"iewjc/am-i-v-fixJunio C Hamano2016-02-171-1/+1
* | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-031-1/+1
|\ \
| * | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-1/+1
| * | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
| |\ \
| * \ \ Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-031-2/+2
| |\ \ \
| * \ \ \ Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-031-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-161-1/+12
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-281-26/+11
|\ \ \ \ \ \ \
| * | | | | | | strbuf: give strbuf_getline() to the "most text friendly" variantjc/strbuf-getlineJunio C Hamano2016-01-151-4/+4
| * | | | | | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-7/+7
| * | | | | | | strbuf: make strbuf_getline_crlf() globalJunio C Hamano2016-01-141-15/+0
* | | | | | | | am: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
|/ / / / / / /
View Lorry Controller Status