| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'jk/war-on-git-path' | Junio C Hamano | 2017-04-26 | 1 | -6/+4 |
| |\ | |||||
| | * | am: drop "dir" parameter from am_state_initjk/war-on-git-path | Jeff King | 2017-04-20 | 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-16 | 1 | -18/+15 |
| | * | | builtin/am: honor --signoff also when --rebasing | Giuseppe Bilotta | 2017-04-16 | 1 | -3/+3 |
| * | | | Merge branch 'rs/misc-cppcheck-fixes' | Junio C Hamano | 2017-04-23 | 1 | -2/+6 |
| |\ \ \ | |||||
| | * | | | am: close stream on error, but not stdin | René Scharfe | 2017-04-16 | 1 | -2/+6 |
| | | |/ | |/| | |||||
| * | | | delete_ref: accept a reflog message argument | Kyle Meyer | 2017-02-20 | 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()cc/apply-am | 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()jc/am-read-author-file | 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 patchjk/reset-ident-time-per-commit | 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 biasjs/am-call-theirs-theirs-in-fallback-3way | 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=mboxrdew/mboxrd-format-am | 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"iewjc/am-i-v-fix | 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 subdirectorynd/diff-with-path-params | Duy Nguyen | 2016-01-21 | 1 | -1/+1 |
| | * | | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -16/+33 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-03 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'pt/am-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+12 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge branch 'jc/strbuf-getline' | Junio C Hamano | 2016-01-28 | 1 | -26/+11 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | strbuf: give strbuf_getline() to the "most text friendly" variantjc/strbuf-getline | Junio C Hamano | 2016-01-15 | 1 | -4/+4 |
| | * | | | | | | | strbuf: introduce strbuf_getline_{lf,nul}() | Junio C Hamano | 2016-01-15 | 1 | -7/+7 |
| | * | | | | | | | strbuf: make strbuf_getline_crlf() global | Junio C Hamano | 2016-01-14 | 1 | -15/+0 |
| * | | | | | | | | am: release pack files before garbage-collecting | Johannes Schindelin | 2016-01-13 | 1 | -0/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Convert struct object to object_id | brian m. carlson | 2015-11-20 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'jc/am-mailinfo-direct' | Junio C Hamano | 2015-10-29 | 1 | -19/+23 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | am: make direct call to mailinfojc/am-mailinfo-direct | Junio C Hamano | 2015-10-21 | 1 | -19/+23 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'tk/stripspace' | Junio C Hamano | 2015-10-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | | strbuf: make stripspace() part of strbuf | Tobias Klauser | 2015-10-16 | 1 | -1/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'rt/placeholder-in-usage' | Junio C Hamano | 2015-10-26 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usage | Ralf Thielow | 2015-10-16 | 1 | -2/+2 |
| | |/ / / / | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |