aboutsummaryrefslogtreecommitdiffstats
path: root/git-am.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2015-08-04builtin-am: remove redirection to git-am.shPaul Tan1-975/+0
2015-08-03Merge branch 'pt/am-foreign'Junio C Hamano1-5/+7
2015-07-24Revert "git-am: add am.threeWay config variable"Junio C Hamano1-9/+0
2015-06-24Merge branch 'pt/am-abort-fix'Junio C Hamano1-8/+23
2015-06-24Merge branch 'rl/am-3way-config'Junio C Hamano1-0/+10
2015-06-15am: teach mercurial patch parser how to read from stdinPaul Tan1-1/+2
2015-06-15am: use gmtime() to parse mercurial patch datePaul Tan1-3/+3
2015-06-15am: teach StGit patch parser how to read from stdinPaul Tan1-1/+2
2015-06-08am --abort: keep unrelated commits on unborn branchPaul Tan1-1/+1
2015-06-08am --abort: support aborting to unborn branchPaul Tan1-1/+8
2015-06-08am --abort: revert changes introduced by failed 3way mergePaul Tan1-1/+5
2015-06-08am --skip: support skipping while on unborn branchPaul Tan1-3/+1
2015-06-08am -3: support 3way merge on unborn branchPaul Tan1-1/+2
2015-06-08am --skip: revert changes introduced by failed 3way mergePaul Tan1-1/+6
2015-06-04git-am: add am.threeWay config variableRemi Lespinet1-0/+9
2015-06-04git-am.sh: fix initialization of the threeway variableRemi Lespinet1-0/+1
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano1-11/+11
2014-12-01*.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy1-11/+11
2014-11-25git-am: add --message-id/--no-message-idPaolo Bonzini1-2/+19
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano1-1/+1
2014-03-31comments: fix misuses of "nor"Justin Lebar1-1/+1
2014-03-25git-am.sh: use the $(...) construct for command substitutionElia Pinto1-15/+15
2014-02-03am: add the --gpg-sign optionNicolas Vigier1-1/+8
2014-02-03am: parse options in stuck-long modeNicolas Vigier1-9/+9
2014-02-03git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier1-0/+1
2013-12-05Merge branch 'jk/replace-perl-in-built-scripts'Junio C Hamano1-2/+2
2013-10-29use @@PERL@@ in built scriptsJeff King1-2/+2
2013-06-27am: replace uses of --resolved with --continueKevin Bracey1-4/+4
2013-06-17am: handle stray $dotest directoryRamkumar Ramachandra1-0/+17
2013-05-12am: return control to caller, for housekeepingRamkumar Ramachandra1-2/+7
2013-05-12am: tighten a conditional that checks for $dotestRamkumar Ramachandra1-1/+3
2013-03-21git-am: show the final log message on "Applying:" indicatorSimon Ruderich1-7/+7
2013-02-05Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano1-1/+1
2013-01-31git-am: record full index line in the patch used while rebasingJunio C Hamano1-1/+1
2013-01-28Merge branch 'dl/am-hg-locale'Junio C Hamano1-1/+1
2013-01-18am: invoke perl's strftime in C localeDmitry V. Levin1-1/+1
2012-09-07Merge branch 'nd/am-i18n-fix'Junio C Hamano1-2/+2
2012-08-22am: quote string for translation before passing to eval_gettextlnNguyễn Thái Ngọc Duy1-2/+2
2012-07-31Merge branch 'jx/i18n-1.7.11'Junio C Hamano1-12/+8
2012-07-26Remove dead code which contains bad gettext blockJiang Xin1-3/+0
2012-07-26i18n: am: mark more strings for translationJiang Xin1-6/+5
2012-07-25i18n: rebase: mark messages for translationJiang Xin1-3/+3
2012-07-22Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano1-0/+5
2012-07-13am: indicate where a failed patch is to be foundPaul Gortmaker1-0/+5
2012-06-26am: don't call mailinfo if $rebasingMartin von Zweigbergk1-23/+24
2012-06-26am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk1-0/+1
2012-04-20Merge branch 'jc/am-report-3way'Junio C Hamano1-0/+6
2012-04-20Merge branch 'jb/am-include'Junio C Hamano1-1/+2
2012-03-28am: support --include optionJohannes Berg1-1/+2
2012-03-28am -3: list the paths that needed 3-way fallbackJunio C Hamano1-0/+6
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-28 19:16:22 +0000