summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)AuthorFilesLines
2012-07-30Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maintLibravatar Junio C Hamano1-0/+5
2012-07-13am: indicate where a failed patch is to be foundLibravatar Paul Gortmaker1-0/+5
2012-04-20Merge branch 'jc/am-report-3way'Libravatar Junio C Hamano1-0/+6
2012-04-20Merge branch 'jb/am-include'Libravatar Junio C Hamano1-1/+2
2012-03-28am: support --include optionLibravatar Johannes Berg1-1/+2
2012-03-28am -3: list the paths that needed 3-way fallbackLibravatar Junio C Hamano1-0/+6
2012-03-13am: officially deprecate -b/--binary optionLibravatar Junio C Hamano1-2/+2
2012-03-12Merge branch 'jc/am-3-nonstandard-popt' into maintLibravatar Junio C Hamano1-4/+7
2012-03-12git-am: error out when seeing -b/--binaryLibravatar Thomas Rast1-1/+3
2012-03-04Merge branch 'jc/am-3-nonstandard-popt'Libravatar Junio C Hamano1-4/+7
2012-02-26Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2012-02-26am: don't infloop for an empty input fileLibravatar Jim Meyering1-1/+1
2012-02-22am -3: allow nonstandard -p<num> optionLibravatar Junio C Hamano1-4/+7
2012-01-29Merge branch 'tr/maint-mailinfo'Libravatar Junio C Hamano1-4/+16
2012-01-16am: learn passing -b to mailinfoLibravatar Thomas Rast1-4/+16
2011-12-09Merge branch 'maint-1.7.7' into maintLibravatar Junio C Hamano1-7/+0
2011-12-09am: don't persist keepcr flagLibravatar Martin von Zweigbergk1-7/+0
2011-10-05Merge branch 'gb/am-hg-patch'Libravatar Junio C Hamano1-0/+34
2011-09-02Merge branch 'gb/maint-am-stgit-author-to-from-fix'Libravatar Junio C Hamano1-1/+1
2011-09-02Merge branch 'gb/maint-am-patch-format-error-message'Libravatar Junio C Hamano1-1/+2
2011-08-29am: preliminary support for hg patchesLibravatar Giuseppe Bilotta1-0/+34
2011-08-29am: fix stgit patch manglingLibravatar Giuseppe Bilotta1-1/+1
2011-08-29am: format is in $patch_format, not parse_patchLibravatar Giuseppe Bilotta1-1/+2
2011-08-25Merge branch 'js/i18n-scripts'Libravatar Junio C Hamano1-17/+14
2011-08-18Merge branch 'db/am-skip-blank-at-the-beginning'Libravatar Junio C Hamano1-3/+8
2011-08-18Merge branch 'ma/am-exclude'Libravatar Junio C Hamano1-1/+2
2011-08-16Merge branch 'maint'Libravatar Junio C Hamano1-0/+2
2011-08-16am: refresh the index at start and --resolvedLibravatar Jeff King1-0/+2
2011-08-11am: ignore leading whitespace before patchLibravatar David Barr1-3/+8
2011-08-08git-am: take advantage of gettextln and eval_gettextln.Libravatar Jon Seymour1-17/+14
2011-08-03am: pass exclude down to applyLibravatar maximilian attems1-1/+2
2011-05-21i18n: git-am printf(1) message to eval_gettextLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-05-21i18n: git-am core say messagesLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am "Falling back" say messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-05-21i18n: git-am "Apply?" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+4
2011-05-21i18n: git-am clean_abort messagesLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am cannot_fallback messagesLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am die messagesLibravatar Ævar Arnfjörð Bjarmason1-7/+7
2011-05-21i18n: git-am gettext + gettext to stderr messageLibravatar Ævar Arnfjörð Bjarmason1-2/+5
2011-05-21i18n: git-am eval_gettext messagesLibravatar Ævar Arnfjörð Bjarmason1-6/+6
2011-05-21i18n: git-am multi-line getttext $msg; echoLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2011-05-21i18n: git-am one-line gettext $msg; echoLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-05-21i18n: git-am add git-sh-i18nLibravatar Ævar Arnfjörð Bjarmason1-0/+1
2010-12-28Merge branch 'jc/maint-rebase-rewrite-last-skip'Libravatar Junio C Hamano1-7/+0
2010-12-22rebase --skip: correctly wrap-up when skipping the last patchLibravatar Junio C Hamano1-7/+0
2010-12-22Merge branch 'jc/maint-am-abort-safely'Libravatar Junio C Hamano1-2/+25
2010-12-21am --abort: keep unrelated commits since the last failure and warnLibravatar Junio C Hamano1-2/+25
2010-10-21Sync with 1.7.3.2Libravatar Junio C Hamano1-1/+1
2010-10-21Merge branch 'sn/doc-opt-notation' into maintLibravatar Junio C Hamano1-1/+1
2010-10-13Merge branch 'maint'Libravatar Junio C Hamano1-1/+1