summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)AuthorFilesLines
2015-08-03Merge branch 'pt/am-abort-fix' into maintLibravatar Junio C Hamano1-8/+23
2015-06-08am --abort: keep unrelated commits on unborn branchLibravatar Paul Tan1-1/+1
2015-06-08am --abort: support aborting to unborn branchLibravatar Paul Tan1-1/+8
2015-06-08am --abort: revert changes introduced by failed 3way mergeLibravatar Paul Tan1-1/+5
2015-06-08am --skip: support skipping while on unborn branchLibravatar Paul Tan1-3/+1
2015-06-08am -3: support 3way merge on unborn branchLibravatar Paul Tan1-1/+2
2015-06-08am --skip: revert changes introduced by failed 3way mergeLibravatar Paul Tan1-1/+6
2014-11-25git-am: add --message-id/--no-message-idLibravatar Paolo Bonzini1-2/+19
2014-04-08Merge branch 'jl/nor-or-nand-and'Libravatar Junio C Hamano1-1/+1
2014-03-31comments: fix misuses of "nor"Libravatar Justin Lebar1-1/+1
2014-03-25git-am.sh: use the $(...) construct for command substitutionLibravatar Elia Pinto1-15/+15
2014-02-03am: add the --gpg-sign optionLibravatar Nicolas Vigier1-1/+8
2014-02-03am: parse options in stuck-long modeLibravatar Nicolas Vigier1-9/+9
2014-02-03git-sh-setup.sh: add variable to use the stuck-long modeLibravatar Nicolas Vigier1-0/+1
2013-12-05Merge branch 'jk/replace-perl-in-built-scripts'Libravatar Junio C Hamano1-2/+2
2013-10-29use @@PERL@@ in built scriptsLibravatar Jeff King1-2/+2
2013-06-27am: replace uses of --resolved with --continueLibravatar Kevin Bracey1-4/+4
2013-06-17am: handle stray $dotest directoryLibravatar Ramkumar Ramachandra1-0/+17
2013-05-12am: return control to caller, for housekeepingLibravatar Ramkumar Ramachandra1-2/+7
2013-05-12am: tighten a conditional that checks for $dotestLibravatar Ramkumar Ramachandra1-1/+3
2013-03-21git-am: show the final log message on "Applying:" indicatorLibravatar Simon Ruderich1-7/+7
2013-02-05Merge branch 'jc/fake-ancestor-with-non-blobs'Libravatar Junio C Hamano1-1/+1
2013-01-31git-am: record full index line in the patch used while rebasingLibravatar Junio C Hamano1-1/+1
2013-01-28Merge branch 'dl/am-hg-locale'Libravatar Junio C Hamano1-1/+1
2013-01-18am: invoke perl's strftime in C localeLibravatar Dmitry V. Levin1-1/+1
2012-09-07Merge branch 'nd/am-i18n-fix'Libravatar Junio C Hamano1-2/+2
2012-08-22am: quote string for translation before passing to eval_gettextlnLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2012-07-31Merge branch 'jx/i18n-1.7.11'Libravatar Junio C Hamano1-12/+8
2012-07-26Remove dead code which contains bad gettext blockLibravatar Jiang Xin1-3/+0
2012-07-26i18n: am: mark more strings for translationLibravatar Jiang Xin1-6/+5
2012-07-25i18n: rebase: mark messages for translationLibravatar Jiang Xin1-3/+3
2012-07-22Merge branch 'pg/maint-1.7.9-am-where-is-patch'Libravatar Junio C Hamano1-0/+5
2012-07-13am: indicate where a failed patch is to be foundLibravatar Paul Gortmaker1-0/+5
2012-06-26am: don't call mailinfo if $rebasingLibravatar Martin von Zweigbergk1-23/+24
2012-06-26am --rebasing: get patch body from commit, not from mailboxLibravatar Martin von Zweigbergk1-0/+1
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