summaryrefslogtreecommitdiffstats
path: root/git-am.sh
AgeCommit message (Expand)AuthorLines
2015-07-24Revert "git-am: add am.threeWay config variable"Junio C Hamano-9/+0
2015-06-24Merge branch 'pt/am-abort-fix'Junio C Hamano-8/+23
2015-06-24Merge branch 'rl/am-3way-config'Junio C Hamano-0/+10
2015-06-08am --abort: keep unrelated commits on unborn branchPaul Tan-1/+1
2015-06-08am --abort: support aborting to unborn branchPaul Tan-1/+8
2015-06-08am --abort: revert changes introduced by failed 3way mergePaul Tan-1/+5
2015-06-08am --skip: support skipping while on unborn branchPaul Tan-3/+1
2015-06-08am -3: support 3way merge on unborn branchPaul Tan-1/+2
2015-06-08am --skip: revert changes introduced by failed 3way mergePaul Tan-1/+6
2015-06-04git-am: add am.threeWay config variableRemi Lespinet-0/+9
2015-06-04git-am.sh: fix initialization of the threeway variableRemi Lespinet-0/+1
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano-11/+11
2014-12-01*.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy-11/+11
2014-11-25git-am: add --message-id/--no-message-idPaolo Bonzini-2/+19
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano-1/+1
2014-03-31comments: fix misuses of "nor"Justin Lebar-1/+1
2014-03-25git-am.sh: use the $(...) construct for command substitutionElia Pinto-15/+15
2014-02-03am: add the --gpg-sign optionNicolas Vigier-1/+8
2014-02-03am: parse options in stuck-long modeNicolas Vigier-9/+9
2014-02-03git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier-0/+1
2013-12-05Merge branch 'jk/replace-perl-in-built-scripts'Junio C Hamano-2/+2
2013-10-29use @@PERL@@ in built scriptsJeff King-2/+2
2013-06-27am: replace uses of --resolved with --continueKevin Bracey-4/+4
2013-06-17am: handle stray $dotest directoryRamkumar Ramachandra-0/+17
2013-05-12am: return control to caller, for housekeepingRamkumar Ramachandra-2/+7
2013-05-12am: tighten a conditional that checks for $dotestRamkumar Ramachandra-1/+3
2013-03-21git-am: show the final log message on "Applying:" indicatorSimon Ruderich-7/+7
2013-02-05Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano-1/+1
2013-01-31git-am: record full index line in the patch used while rebasingJunio C Hamano-1/+1
2013-01-28Merge branch 'dl/am-hg-locale'Junio C Hamano-1/+1
2013-01-18am: invoke perl's strftime in C localeDmitry V. Levin-1/+1
2012-09-07Merge branch 'nd/am-i18n-fix'Junio C Hamano-2/+2
2012-08-22am: quote string for translation before passing to eval_gettextlnNguyễn Thái Ngọc Duy-2/+2
2012-07-31Merge branch 'jx/i18n-1.7.11'Junio C Hamano-12/+8
2012-07-26Remove dead code which contains bad gettext blockJiang Xin-3/+0
2012-07-26i18n: am: mark more strings for translationJiang Xin-6/+5
2012-07-25i18n: rebase: mark messages for translationJiang Xin-3/+3
2012-07-22Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano-0/+5
2012-07-13am: indicate where a failed patch is to be foundPaul Gortmaker-0/+5
2012-06-26am: don't call mailinfo if $rebasingMartin von Zweigbergk-23/+24
2012-06-26am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk-0/+1
2012-04-20Merge branch 'jc/am-report-3way'Junio C Hamano-0/+6
2012-04-20Merge branch 'jb/am-include'Junio C Hamano-1/+2
2012-03-28am: support --include optionJohannes Berg-1/+2
2012-03-28am -3: list the paths that needed 3-way fallbackJunio C Hamano-0/+6
2012-03-13am: officially deprecate -b/--binary optionJunio C Hamano-2/+2
2012-03-12Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano-4/+7
2012-03-12git-am: error out when seeing -b/--binaryThomas Rast-1/+3
2012-03-04Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano-4/+7
2012-02-26Merge branch 'maint'Junio C Hamano-1/+1
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-30 08:17:42 +0000