summaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAgeFilesLines
* builtin-am: remove redirection to git-am.shPaul Tan2015-08-041-975/+0
* Merge branch 'pt/am-foreign'Junio C Hamano2015-08-031-5/+7
|\
| * am: teach mercurial patch parser how to read from stdinpt/am-foreignPaul Tan2015-06-151-1/+2
| * am: use gmtime() to parse mercurial patch datePaul Tan2015-06-151-3/+3
| * am: teach StGit patch parser how to read from stdinPaul Tan2015-06-151-1/+2
* | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-241-9/+0
* | Merge branch 'pt/am-abort-fix'Junio C Hamano2015-06-241-8/+23
|\ \
| * | am --abort: keep unrelated commits on unborn branchpt/am-abort-fixPaul Tan2015-06-081-1/+1
| * | am --abort: support aborting to unborn branchPaul Tan2015-06-081-1/+8
| * | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-081-1/+5
| * | am --skip: support skipping while on unborn branchPaul Tan2015-06-081-3/+1
| * | am -3: support 3way merge on unborn branchPaul Tan2015-06-081-1/+2
| * | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-081-1/+6
* | | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-241-0/+10
|\ \ \
| * | | git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-041-0/+9
| * | | git-am.sh: fix initialization of the threeway variableRemi Lespinet2015-06-041-0/+1
| | |/ | |/|
* | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-11/+11
|\ \ \ | |/ / |/| |
| * | *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy2014-12-011-11/+11
| |/
* | git-am: add --message-id/--no-message-idpb/am-message-id-footerPaolo Bonzini2014-11-251-2/+19
|/
* Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-1/+1
|\
| * comments: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
* | git-am.sh: use the $(...) construct for command substitutionElia Pinto2014-03-251-15/+15
* | am: add the --gpg-sign optionNicolas Vigier2014-02-031-1/+8
* | am: parse options in stuck-long modeNicolas Vigier2014-02-031-9/+9
* | git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier2014-02-031-0/+1
|/
* Merge branch 'jk/replace-perl-in-built-scripts'Junio C Hamano2013-12-051-2/+2
|\
| * use @@PERL@@ in built scriptsjk/replace-perl-in-built-scriptsJeff King2013-10-291-2/+2
* | am: replace uses of --resolved with --continueKevin Bracey2013-06-271-4/+4
* | am: handle stray $dotest directoryRamkumar Ramachandra2013-06-171-0/+17
* | am: return control to caller, for housekeepingRamkumar Ramachandra2013-05-121-2/+7
* | am: tighten a conditional that checks for $dotestRamkumar Ramachandra2013-05-121-1/+3
* | git-am: show the final log message on "Applying:" indicatorSimon Ruderich2013-03-211-7/+7
|/
* Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-051-1/+1
|\
| * git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-311-1/+1
* | Merge branch 'dl/am-hg-locale'Junio C Hamano2013-01-281-1/+1
|\ \ | |/ |/|
| * am: invoke perl's strftime in C localeDmitry V. Levin2013-01-181-1/+1
* | Merge branch 'nd/am-i18n-fix'Junio C Hamano2012-09-071-2/+2
|\ \
| * | am: quote string for translation before passing to eval_gettextlnNguyễn Thái Ngọc Duy2012-08-221-2/+2
* | | Merge branch 'jx/i18n-1.7.11'Junio C Hamano2012-07-311-12/+8
|\ \ \
| * | | Remove dead code which contains bad gettext blockJiang Xin2012-07-261-3/+0
| * | | i18n: am: mark more strings for translationJiang Xin2012-07-261-6/+5
| * | | i18n: rebase: mark messages for translationJiang Xin2012-07-251-3/+3
* | | | Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano2012-07-221-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am: indicate where a failed patch is to be foundPaul Gortmaker2012-07-131-0/+5
| * | Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-121-4/+7
| |\ \
* | | | am: don't call mailinfo if $rebasingMartin von Zweigbergk2012-06-261-23/+24
* | | | am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk2012-06-261-0/+1
* | | | Merge branch 'jc/am-report-3way'Junio C Hamano2012-04-201-0/+6
|\ \ \ \
| * | | | am -3: list the paths that needed 3-way fallbackJunio C Hamano2012-03-281-0/+6
* | | | | Merge branch 'jb/am-include'Junio C Hamano2012-04-201-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
View Lorry Controller Status