Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/unbreak-am-h' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+3 |
|\ | |||||
| * | am: handle "-h" argument earlier | Jeff King | 2017-05-30 | 1 | -0/+3 |
* | | Merge branch 'rs/checkout-am-fix-unborn' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 |
|\ \ | |||||
| * | | am: check return value of resolve_refdup before using hash | René Scharfe | 2017-05-08 | 1 | -1/+1 |
* | | | Merge branch 'js/plug-leaks' into maint | Junio C Hamano | 2017-06-04 | 1 | -9/+6 |
|\ \ \ | |||||
| * | | | get_mail_commit_oid(): avoid resource leak | Johannes Schindelin | 2017-05-08 | 1 | -9/+6 |
| | |/ | |/| | |||||
* | | | Merge branch 'jk/am-leakfix' into maint | Junio C Hamano | 2017-06-04 | 1 | -20/+14 |
|\ \ \ | |||||
| * | | | am: shorten ident_split variable name in get_commit_info() | Jeff King | 2017-04-27 | 1 | -11/+9 |
| * | | | am: simplify allocations in get_commit_info() | Jeff King | 2017-04-27 | 1 | -15/+10 |
| * | | | am: fix commit buffer leak in get_commit_info() | Jeff King | 2017-04-27 | 1 | -0/+1 |
* | | | | Merge branch 'ja/do-not-ask-needless-questions' into maint | Junio C Hamano | 2017-06-04 | 1 | -2/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | usability: don't ask questions if no reply is required | Jean-Noel Avila | 2017-05-12 | 1 | -2/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'jk/war-on-git-path' | Junio C Hamano | 2017-04-26 | 1 | -6/+4 |
|\ \ \ | |||||
| * | | | am: drop "dir" parameter from am_state_init | Jeff King | 2017-04-21 | 1 | -6/+4 |
| |/ / | |||||
* | | | Merge branch 'gb/rebase-signoff' | Junio C Hamano | 2017-04-26 | 1 | -21/+18 |
|\ \ \ | |||||
| * | | | builtin/am: fold am_signoff() into am_append_signoff() | Giuseppe Bilotta | 2017-04-17 | 1 | -18/+15 |
| * | | | builtin/am: honor --signoff also when --rebasing | Giuseppe Bilotta | 2017-04-17 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'rs/misc-cppcheck-fixes' | Junio C Hamano | 2017-04-24 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | am: close stream on error, but not stdin | René Scharfe | 2017-04-17 | 1 | -2/+6 |
| | |/ | |/| | |||||
* / | | delete_ref: accept a reflog message argument | Kyle Meyer | 2017-02-21 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'sb/sequencer-abort-safety' | Junio C Hamano | 2016-12-21 | 1 | -2/+2 |
|\| | |||||
| * | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 | 1 | -1/+1 |
| * | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 | 1 | -1/+1 |
* | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 | 1 | -70/+70 |
|\ | |||||
| * | builtin/am: convert to struct object_id | brian m. carlson | 2016-09-07 | 1 | -70/+70 |
* | | Merge branch 'cc/apply-am' | Junio C Hamano | 2016-09-19 | 1 | -22/+43 |
|\ \ | |||||
| * | | builtin/am: use apply API in run_apply() | Christian Couder | 2016-09-07 | 1 | -22/+43 |
* | | | Merge branch 'ah/misc-message-fixes' | Junio C Hamano | 2016-09-15 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | am: put spaces around pipe in usage string | Alex Henrie | 2016-09-08 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | am: refactor read_author_script() | Junio C Hamano | 2016-08-30 | 1 | -58/+45 |
|/ / | |||||
* | | Merge branch 'js/am-3-merge-recursive-direct' | Junio C Hamano | 2016-08-10 | 1 | -40/+22 |
|\ \ | |||||
| * | | am -3: use merge_recursive() directly again | Johannes Schindelin | 2016-07-26 | 1 | -40/+22 |
| |/ | |||||
* | | Merge branch 'jk/reset-ident-time-per-commit' | Junio C Hamano | 2016-08-10 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | am: reset cached ident date for each patch | Jeff King | 2016-08-01 | 1 | -0/+2 |
* | | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' | Junio C Hamano | 2016-07-19 | 1 | -8/+8 |
|\ \ | |||||
| * | | am: counteract gender bias | Johannes Schindelin | 2016-07-08 | 1 | -8/+8 |
| |/ | |||||
* | | Merge branch 'jk/write-file' | Junio C Hamano | 2016-07-19 | 1 | -15/+10 |
|\ \ | |||||
| * | | use write_file_buf where applicable | Jeff King | 2016-07-08 | 1 | -6/+1 |
| * | | am: ignore return value of write_file() | René Scharfe | 2016-07-08 | 1 | -9/+9 |
* | | | am: support --patch-format=mboxrd | Eric Wong | 2016-06-06 | 1 | -3/+11 |
|/ / | |||||
* / | builtin/am.c: use error_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -6/+5 |
|/ | |||||
* | Merge branch 'jc/am-i-v-fix' | Junio C Hamano | 2016-02-24 | 1 | -1/+1 |
|\ | |||||
| * | am -i: fix "v"iew | Junio C Hamano | 2016-02-17 | 1 | -1/+1 |
* | | Merge branch 'nd/diff-with-path-params' | Junio C Hamano | 2016-02-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | diff: make -O and --output work in subdirectory | Duy Nguyen | 2016-01-21 | 1 | -1/+1 |
| * | | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-04 | 1 | -16/+33 |
| |\ \ | |||||
| * \ \ | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-04 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-04 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'pt/am-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+12 |
| |\ \ \ \ \ |