| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 | 1 | -2/+29 |
|\ |
|
| * | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fix | Junio C Hamano | 2015-09-06 | 1 | -2/+29 |
* | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fix | Jeff King | 2015-09-01 | 1 | -5/+0 |
* | | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-08-31 | 1 | -27/+41 |
|\ \ |
|
| * | | write_file_v(): do not leave incomplete line at the end | Junio C Hamano | 2015-08-25 | 1 | -8/+2 |
| * | | write_file(): drop "fatal" parameter | Junio C Hamano | 2015-08-24 | 1 | -2/+2 |
| * | | builtin/am: make sure state files are text | Junio C Hamano | 2015-08-24 | 1 | -2/+8 |
| * | | builtin/am: introduce write_state_*() helper functions | Junio C Hamano | 2015-08-24 | 1 | -27/+41 |
| |/ |
|
* | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ |
|
| * | | i18n: am: fix typo in description of -b option | Jiang Xin | 2015-08-26 | 1 | -1/+1 |
* | | | Merge branch 'pt/am-builtin-abort-fix' | Junio C Hamano | 2015-08-26 | 1 | -13/+36 |
|\ \ \ |
|
| * | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fix | Paul Tan | 2015-08-19 | 1 | -13/+36 |
| |/ / |
|
* | | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 1 | -0/+1 |
| |/
|/| |
|
* | | am: let --signoff override --no-signoffpt/am-builtin-options | Paul Tan | 2015-08-12 | 1 | -3/+25 |
* | | am: let command-line options override saved options | Paul Tan | 2015-08-12 | 1 | -4/+12 |
|/ |
|
* | git-am: add am.threeWay config variable | Remi Lespinet | 2015-08-04 | 1 | -0/+2 |
* | builtin-am: remove redirection to git-am.sh | Paul Tan | 2015-08-04 | 1 | -15/+0 |
* | builtin-am: check for valid committer ident | Paul Tan | 2015-08-04 | 1 | -0/+3 |
* | builtin-am: implement legacy -b/--binary option | Paul Tan | 2015-08-04 | 1 | -0/+7 |
* | builtin-am: implement -i/--interactive | Paul Tan | 2015-08-04 | 1 | -1/+104 |
* | builtin-am: support and auto-detect mercurial patches | Paul Tan | 2015-08-04 | 1 | -1/+73 |
* | builtin-am: support and auto-detect StGit series files | Paul Tan | 2015-08-04 | 1 | -1/+58 |
* | builtin-am: support and auto-detect StGit patches | Paul Tan | 2015-08-04 | 1 | -1/+131 |
* | builtin-am: rerere support | Paul Tan | 2015-08-04 | 1 | -0/+25 |
* | builtin-am: invoke post-applypatch hook | Paul Tan | 2015-08-04 | 1 | -0/+2 |
* | builtin-am: invoke pre-applypatch hook | Paul Tan | 2015-08-04 | 1 | -0/+3 |
* | builtin-am: invoke applypatch-msg hook | Paul Tan | 2015-08-04 | 1 | -0/+24 |
* | builtin-am: support automatic notes copying | Paul Tan | 2015-08-04 | 1 | -0/+60 |
* | builtin-am: invoke post-rewrite hook | Paul Tan | 2015-08-04 | 1 | -0/+55 |
* | builtin-am: implement -S/--gpg-sign, commit.gpgsign | Paul Tan | 2015-08-04 | 1 | -1/+10 |
* | builtin-am: implement --committer-date-is-author-date | Paul Tan | 2015-08-04 | 1 | -0/+8 |
* | builtin-am: implement --ignore-date | Paul Tan | 2015-08-04 | 1 | -1/+5 |
* | builtin-am: pass git-apply's options to git-apply | Paul Tan | 2015-08-04 | 1 | -0/+45 |
* | builtin-am: implement --[no-]scissors | Paul Tan | 2015-08-04 | 1 | -0/+48 |
* | builtin-am: support --keep-cr, am.keepcr | Paul Tan | 2015-08-04 | 1 | -6/+23 |
* | builtin-am: implement --[no-]message-id, am.messageid | Paul Tan | 2015-08-04 | 1 | -0/+13 |
* | builtin-am: implement -k/--keep, --keep-non-patch | Paul Tan | 2015-08-04 | 1 | -0/+50 |
* | builtin-am: implement -u/--utf8 | Paul Tan | 2015-08-04 | 1 | -0/+11 |
* | builtin-am: handle stray state directory | Paul Tan | 2015-08-04 | 1 | -0/+17 |
* | builtin-am: bypass git-mailinfo when --rebasing | Paul Tan | 2015-08-04 | 1 | -1/+133 |
* | builtin-am: implement --rebasing mode | Paul Tan | 2015-08-04 | 1 | -4/+26 |
* | builtin-am: implement --3way | Paul Tan | 2015-08-04 | 1 | -4/+150 |
* | builtin-am: implement -s/--signoff | Paul Tan | 2015-08-04 | 1 | -0/+12 |
* | builtin-am: exit with user friendly message on failure | Paul Tan | 2015-08-04 | 1 | -4/+26 |
* | builtin-am: implement -q/--quiet | Paul Tan | 2015-08-04 | 1 | -3/+28 |
* | builtin-am: reject patches when there's a session in progress | Paul Tan | 2015-08-04 | 1 | -0/+15 |
* | builtin-am: implement --abort | Paul Tan | 2015-08-04 | 1 | -3/+100 |
* | builtin-am: implement --skip | Paul Tan | 2015-08-04 | 1 | -2/+121 |
* | builtin-am: don't parse mail when resuming | Paul Tan | 2015-08-04 | 1 | -9/+25 |
* | builtin-am: implement --resolved/--continue | Paul Tan | 2015-08-04 | 1 | -1/+71 |