Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'sh/am-keep-cr' | Junio C Hamano | 2010-03-10 | 1 | -7/+25 | |
|\ \ \ \ \ | ||||||
| * | | | | | git-am: Add am.keepcr and --no-keep-cr to override it | Stefan-W. Hahn | 2010-02-28 | 1 | -5/+15 | |
| * | | | | | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit | Stefan-W. Hahn | 2010-02-28 | 1 | -7/+15 | |
* | | | | | | Merge branch 'jn/maint-fix-pager' | Junio C Hamano | 2010-03-02 | 1 | -4/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | am: Fix launching of pager | Jonathan Nieder | 2010-02-14 | 1 | -4/+1 | |
* | | | | | | am: remove rebase-apply directory before gc | Jonathan Nieder | 2010-02-23 | 1 | -2/+1 | |
|/ / / / / | ||||||
* | | | | | am: switch --resolved to --continue | Jeff King | 2010-02-11 | 1 | -2/+3 | |
* | | | | | am: fix patch format detection for Thunderbird "Save As" emails | Stephen Boyd | 2010-01-25 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -1/+5 | |
* | | | | Merge branch 'jc/maint-am-keep' | Junio C Hamano | 2009-11-30 | 1 | -5/+6 | |
|\ \ \ \ | ||||||
| * | | | | Remove dead code from "git am" | Junio C Hamano | 2009-11-27 | 1 | -5/+6 | |
* | | | | | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano | 2009-11-25 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Protect scripted Porcelains from GREP_OPTIONS insanity | Junio C Hamano | 2009-11-23 | 1 | -2/+2 | |
* | | | | | | Merge branch 'ls/maint-mailinfo-no-inbody' | Junio C Hamano | 2009-11-22 | 1 | -3/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | git am/mailinfo: Don't look at in-body headers when rebasing | Lukas Sandström | 2009-11-20 | 1 | -3/+10 | |
| |/ / / / / | ||||||
* | | | | | | am -i, git-svn: use "git var GIT_PAGER" | Jonathan Nieder | 2009-11-13 | 1 | -1/+4 | |
|/ / / / / | ||||||
* | | | | | git-am: force egrep to use correct characters set | Christian Himpel | 2009-09-25 | 1 | -1/+1 | |
* | | | | | git-am: fixed patch_format detection according to RFC2822 | Christian Himpel | 2009-09-25 | 1 | -1/+1 | |
* | | | | | am/mailinfo: Disable scissors processing by default | Junio C Hamano | 2009-08-26 | 1 | -6/+17 | |
* | | | | | Merge branch 'gb/apply-ignore-whitespace' | Junio C Hamano | 2009-08-21 | 1 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | git apply: option to ignore whitespace differences | Giuseppe Bilotta | 2009-08-05 | 1 | -1/+3 | |
* | | | | | | Merge branch 'bc/mailsplit-cr-at-eol' | Junio C Hamano | 2009-08-21 | 1 | -1/+7 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings | Junio C Hamano | 2009-08-05 | 1 | -1/+7 | |
| |/ / / / | ||||||
* | | | | | git-am: print fair error message when format detection fails | Nicolas Sebrecht | 2009-08-06 | 1 | -1/+5 | |
* | | | | | am: allow individual e-mail files as input | Junio C Hamano | 2009-08-06 | 1 | -0/+14 | |
|/ / / / | ||||||
* | | | | Merge branch 'gb/am-foreign' | Junio C Hamano | 2009-07-06 | 1 | -4/+127 | |
|\ \ \ \ | ||||||
| * | | | | git-am: refactor 'cleaning up and aborting' | Giuseppe Bilotta | 2009-06-13 | 1 | -14/+13 | |
| | |_|/ | |/| | | ||||||
| * | | | git-am foreign patch support: StGIT support | Giuseppe Bilotta | 2009-05-28 | 1 | -0/+57 | |
| * | | | git-am foreign patch support: autodetect some patch formats | Giuseppe Bilotta | 2009-05-28 | 1 | -1/+39 | |
| * | | | git-am foreign patch support: introduce patch_format | Giuseppe Bilotta | 2009-05-28 | 1 | -4/+33 | |
* | | | | am, rebase: teach quiet option | Stephen Boyd | 2009-06-18 | 1 | -7/+19 | |
| |_|/ |/| | | ||||||
* | | | am: suppress apply errors when using 3-way | Stephen Boyd | 2009-06-18 | 1 | -1/+8 | |
|/ / | ||||||
* | | am: simplify "sq" function by using "git rev-parse --sq-quote" | Christian Couder | 2009-05-10 | 1 | -5/+1 | |
* | | Work around ash "alternate value" expansion bug | Ben Jackson | 2009-04-18 | 1 | -1/+1 | |
* | | git-am: teach git-am to apply a patch to an unborn branch | Nanako Shiraishi | 2009-04-12 | 1 | -5/+24 | |
* | | git-am: make --abort less dangerous | Junio C Hamano | 2009-02-26 | 1 | -0/+7 | |
* | | git-am: Keep index in case of abort with dirty index | Michael J Gruber | 2009-02-26 | 1 | -3/+10 | |
* | | Merge branch 'ns/am-slacker' | Junio C Hamano | 2009-02-04 | 1 | -1/+20 | |
|\ \ | ||||||
| * | | git-am: Add --ignore-date option | Nanako Shiraishi | 2009-01-25 | 1 | -0/+8 | |
| * | | am: Add --committer-date-is-author-date option | Junio C Hamano | 2009-01-25 | 1 | -1/+12 | |
* | | | git-am: minor cleanups | Jay Soffian | 2009-01-28 | 1 | -8/+4 | |
|/ / | ||||||
* | | git-am: implement --reject option passed to git-apply | martin f. krafft | 2009-01-23 | 1 | -0/+3 | |
* | | Merge branch 'jf/am-failure-report' | Junio C Hamano | 2009-01-21 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | git-am: re-fix the diag message printing | Junio C Hamano | 2009-01-18 | 1 | -1/+1 | |
| * | | git-am: Make it easier to see which patch failed | Jonas Flodén | 2009-01-17 | 1 | -1/+1 | |
* | | | git-am: fix shell quoting | Junio C Hamano | 2009-01-14 | 1 | -1/+1 | |
* | | | git-am: add --directory=<dir> option | Junio C Hamano | 2009-01-12 | 1 | -4/+13 | |
|/ / | ||||||
* | | git-am: rename apply_opt_extra file to apply-opt | Junio C Hamano | 2008-12-05 | 1 | -2/+2 | |
* | | git-am: propagate --3way options as well | Junio C Hamano | 2008-12-04 | 1 | -2/+7 | |
* | | git-am: propagate -C<n>, -p<n> options as well | Junio C Hamano | 2008-12-04 | 1 | -7/+7 |