summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)Author
2012-04-20Merge branch 'jc/am-report-3way'Junio C Hamano
2012-04-20Merge branch 'jb/am-include'Junio C Hamano
2012-03-28am: support --include optionJohannes Berg
2012-03-28am -3: list the paths that needed 3-way fallbackJunio C Hamano
2012-03-13am: officially deprecate -b/--binary optionJunio C Hamano
2012-03-12git-am: error out when seeing -b/--binaryThomas Rast
2012-03-05Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano
2012-02-27Merge branch 'maint'Junio C Hamano
2012-02-27am: don't infloop for an empty input fileJim Meyering
2012-02-23am -3: allow nonstandard -p<num> optionJunio C Hamano
2012-01-29Merge branch 'tr/maint-mailinfo'Junio C Hamano
2012-01-17am: learn passing -b to mailinfoThomas Rast
2011-12-09Merge branch 'maint-1.7.7' into maintJunio C Hamano
2011-12-09am: don't persist keepcr flagMartin von Zweigbergk
2011-10-05Merge branch 'gb/am-hg-patch'Junio C Hamano
2011-09-02Merge branch 'gb/maint-am-stgit-author-to-from-fix'Junio C Hamano
2011-09-02Merge branch 'gb/maint-am-patch-format-error-message'Junio C Hamano
2011-08-29am: preliminary support for hg patchesGiuseppe Bilotta
2011-08-29am: fix stgit patch manglingGiuseppe Bilotta
2011-08-29am: format is in $patch_format, not parse_patchGiuseppe Bilotta
2011-08-25Merge branch 'js/i18n-scripts'Junio C Hamano
2011-08-19Merge branch 'db/am-skip-blank-at-the-beginning'Junio C Hamano
2011-08-19Merge branch 'ma/am-exclude'Junio C Hamano
2011-08-16Merge branch 'maint'Junio C Hamano
2011-08-16am: refresh the index at start and --resolvedJeff King
2011-08-11am: ignore leading whitespace before patchDavid Barr
2011-08-08git-am: take advantage of gettextln and eval_gettextln.Jon Seymour
2011-08-03am: pass exclude down to applymaximilian attems
2011-05-21i18n: git-am printf(1) message to eval_gettextÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am core say messagesÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am "Falling back" say messageÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am "Apply?" messageÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am clean_abort messagesÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am cannot_fallback messagesÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am die messagesÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am gettext + gettext to stderr messageÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am eval_gettext messagesÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am multi-line getttext $msg; echoÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am one-line gettext $msg; echoÆvar Arnfjörð Bjarmason
2011-05-21i18n: git-am add git-sh-i18nÆvar Arnfjörð Bjarmason
2010-12-28Merge branch 'jc/maint-rebase-rewrite-last-skip'Junio C Hamano
2010-12-23rebase --skip: correctly wrap-up when skipping the last patchJunio C Hamano
2010-12-22Merge branch 'jc/maint-am-abort-safely'Junio C Hamano
2010-12-21am --abort: keep unrelated commits since the last failure and warnJunio C Hamano
2010-10-22Sync with 1.7.3.2Junio C Hamano
2010-10-21Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano
2010-10-14Merge branch 'maint'Junio C Hamano
2010-10-13shell portability: no "export VAR=VAL"Junio C Hamano
2010-10-08Use parentheses and `...' where appropriateŠtěpán Němec
2010-10-03git-am: fix detection of absolute paths for windowsPat Thoyts