Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'jc/strbuf-getline' | Junio C Hamano | 2016-01-29 | 1 | -26/+11 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | strbuf: give strbuf_getline() to the "most text friendly" variant | 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-15 | 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 mailinfo | Junio C Hamano | 2015-10-22 | 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 string | Ralf Thielow | 2015-10-16 | 1 | -2/+2 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'jc/am-3-fallback-regression-fix' | Junio C Hamano | 2015-10-26 | 1 | -16/+33 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | am -3: do not let failed merge from completing the error codepath | Junio C Hamano | 2015-10-09 | 1 | -16/+33 | |
| |/ / / | ||||||
* | | | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-10-16 | 1 | -1/+12 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | am: configure gpg at startup | Renee Margaret McConahy | 2015-09-30 | 1 | -1/+12 | |
* | | | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-09 | 1 | -2/+29 | |
|\ \ \ | ||||||
| * | | | am: match --signoff to the original scripted version | Junio C Hamano | 2015-09-07 | 1 | -2/+29 | |
* | | | | rerere: release lockfile in non-writing functions | Jeff King | 2015-09-02 | 1 | -5/+0 | |
* | | | | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-09-01 | 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-27 | 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-27 | 1 | -13/+36 | |
|\ \ \ | ||||||
| * | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into index | 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-signoff | 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-05 | 1 | -0/+2 | |
* | builtin-am: remove redirection to git-am.sh | Paul Tan | 2015-08-05 | 1 | -15/+0 | |
* | builtin-am: check for valid committer ident | Paul Tan | 2015-08-05 | 1 | -0/+3 | |
* | builtin-am: implement legacy -b/--binary option | Paul Tan | 2015-08-05 | 1 | -0/+7 | |
* | builtin-am: implement -i/--interactive | Paul Tan | 2015-08-05 | 1 | -1/+104 | |
* | builtin-am: support and auto-detect mercurial patches | Paul Tan | 2015-08-05 | 1 | -1/+73 | |
* | builtin-am: support and auto-detect StGit series files | Paul Tan | 2015-08-05 | 1 | -1/+58 | |
* | builtin-am: support and auto-detect StGit patches | Paul Tan | 2015-08-05 | 1 | -1/+131 | |
* | builtin-am: rerere support | Paul Tan | 2015-08-05 | 1 | -0/+25 | |
* | builtin-am: invoke post-applypatch hook | Paul Tan | 2015-08-05 | 1 | -0/+2 | |
* | builtin-am: invoke pre-applypatch hook | Paul Tan | 2015-08-05 | 1 | -0/+3 | |
* | builtin-am: invoke applypatch-msg hook | Paul Tan | 2015-08-05 | 1 | -0/+24 | |
* | builtin-am: support automatic notes copying | Paul Tan | 2015-08-05 | 1 | -0/+60 | |
* | builtin-am: invoke post-rewrite hook | Paul Tan | 2015-08-05 | 1 | -0/+55 | |
* | builtin-am: implement -S/--gpg-sign, commit.gpgsign | Paul Tan | 2015-08-05 | 1 | -1/+10 | |
* | builtin-am: implement --committer-date-is-author-date | Paul Tan | 2015-08-05 | 1 | -0/+8 | |
* | builtin-am: implement --ignore-date | Paul Tan | 2015-08-05 | 1 | -1/+5 | |
* | builtin-am: pass git-apply's options to git-apply | Paul Tan | 2015-08-05 | 1 | -0/+45 | |
* | builtin-am: implement --[no-]scissors | Paul Tan | 2015-08-05 | 1 | -0/+48 |