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