Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint | Junio C Hamano | 2012-07-30 |
|\ | |||
| * | am: indicate where a failed patch is to be found | Paul Gortmaker | 2012-07-13 |
| * | Merge branch 'jc/am-3-nonstandard-popt' into maint | Junio C Hamano | 2012-03-12 |
| |\ | |||
* | \ | Merge branch 'jc/am-report-3way' | Junio C Hamano | 2012-04-20 |
|\ \ \ | |||
| * | | | am -3: list the paths that needed 3-way fallback | Junio C Hamano | 2012-03-28 |
* | | | | Merge branch 'jb/am-include' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ | |/ / / |/| | | | |||
| * | | | am: support --include option | Johannes Berg | 2012-03-28 |
* | | | | am: officially deprecate -b/--binary option | Junio C Hamano | 2012-03-13 |
* | | | | git-am: error out when seeing -b/--binary | Thomas Rast | 2012-03-12 |
* | | | | Merge branch 'jc/am-3-nonstandard-popt' | Junio C Hamano | 2012-03-04 |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | am -3: allow nonstandard -p<num> option | Junio C Hamano | 2012-02-22 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-26 |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | am: don't infloop for an empty input file | Jim Meyering | 2012-02-26 |
| |/ / | |||
* | | | Merge branch 'tr/maint-mailinfo' | Junio C Hamano | 2012-01-29 |
|\ \ \ | |/ / |/| | | |||
| * | | am: learn passing -b to mailinfo | Thomas Rast | 2012-01-16 |
* | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-09 |
|\ \ \ | |||
| * | | | am: don't persist keepcr flag | Martin von Zweigbergk | 2011-12-09 |
* | | | | Merge branch 'gb/am-hg-patch' | Junio C Hamano | 2011-10-05 |
|\ \ \ \ | |/ / / |/| | | | |||
| * | | | am: preliminary support for hg patches | Giuseppe Bilotta | 2011-08-29 |
* | | | | Merge branch 'gb/maint-am-stgit-author-to-from-fix' | Junio C Hamano | 2011-09-02 |
|\ \ \ \ | |||
| * | | | | am: fix stgit patch mangling | Giuseppe Bilotta | 2011-08-29 |
| |/ / / | |||
* | | | | Merge branch 'gb/maint-am-patch-format-error-message' | Junio C Hamano | 2011-09-02 |
|\ \ \ \ | |||
| * | | | | am: format is in $patch_format, not parse_patch | Giuseppe Bilotta | 2011-08-29 |
* | | | | | Merge branch 'js/i18n-scripts' | Junio C Hamano | 2011-08-25 |
|\ \ \ \ \ | |||
| * | | | | | git-am: take advantage of gettextln and eval_gettextln. | Jon Seymour | 2011-08-08 |
* | | | | | | Merge branch 'db/am-skip-blank-at-the-beginning' | Junio C Hamano | 2011-08-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | am: ignore leading whitespace before patch | David Barr | 2011-08-11 |
| |/ / / / / | |||
* | | | | | | Merge branch 'ma/am-exclude' | Junio C Hamano | 2011-08-18 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | am: pass exclude down to apply | maximilian attems | 2011-08-03 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-08-16 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | am: refresh the index at start and --resolved | Jeff King | 2011-08-16 |
| |/ / / | |||
* | | | | i18n: git-am printf(1) message to eval_gettext | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am core say messages | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am "Falling back" say message | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am "Apply?" message | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am clean_abort messages | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am cannot_fallback messages | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am die messages | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am gettext + gettext to stderr message | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am eval_gettext messages | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am multi-line getttext $msg; echo | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am one-line gettext $msg; echo | Ævar Arnfjörð Bjarmason | 2011-05-21 |
* | | | | i18n: git-am add git-sh-i18n | Ævar Arnfjörð Bjarmason | 2011-05-21 |
|/ / / | |||
* | | | Merge branch 'jc/maint-rebase-rewrite-last-skip' | Junio C Hamano | 2010-12-28 |
|\ \ \ | |||
| * | | | rebase --skip: correctly wrap-up when skipping the last patch | Junio C Hamano | 2010-12-22 |
* | | | | Merge branch 'jc/maint-am-abort-safely' | Junio C Hamano | 2010-12-22 |
|\ \ \ \ | |||
| * | | | | am --abort: keep unrelated commits since the last failure and warn | Junio C Hamano | 2010-12-21 |
| |/ / / | |||
* | | | | Sync with 1.7.3.2 | Junio C Hamano | 2010-10-21 |
|\ \ \ \ | |/ / / | |||
| * | | | Merge branch 'sn/doc-opt-notation' into maint | Junio C Hamano | 2010-10-21 |
| |\ \ \ | |||
| | * | | | Use parentheses and `...' where appropriate | Štěpán Němec | 2010-10-08 |