summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/doc-tt'Junio C Hamano2016-07-131-2/+2
|\
| * doc: typeset long command-line options as literalMatthieu Moy2016-06-281-2/+2
* | am: support --patch-format=mboxrdew/mboxrd-format-amEric Wong2016-06-061-1/+2
|/
* Expand documentation describing --signoffdw/signoff-docDavid A. Wheeler2016-01-051-0/+1
* Merge branch 'mm/keyid-docs' into maintJunio C Hamano2015-10-161-1/+3
|\
| * Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-211-1/+3
* | git-am: add am.threeWay config variableRemi Lespinet2015-08-041-2/+5
|/
* Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-241-5/+2
* git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-041-2/+5
* Merge branch 'mm/am-c-doc'Junio C Hamano2015-03-051-1/+2
|\
| * Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-docMatthieu Moy2015-02-201-1/+2
* | Merge branch 'rw/apply-does-not-take-ignore-date'Junio C Hamano2014-12-221-1/+0
|\ \
| * | git-am.txt: --ignore-date flag is not passed to git-applyrw/apply-does-not-take-ignore-dateRonald Wampler2014-12-091-1/+0
* | | git-am: add --message-id/--no-message-idpb/am-message-id-footerPaolo Bonzini2014-11-251-0/+11
| |/ |/|
* | Merge branch 'cp/am-patch-format-doc'Junio C Hamano2014-03-251-1/+7
|\ \
| * | Documentation/git-am: typofixcp/am-patch-format-docChris Packham2014-03-171-1/+1
| * | Documentation/git-am: Document supported --patch-format optionsChris Packham2014-03-111-3/+9
* | | Merge branch 'jn/am-doc-hooks'Junio C Hamano2014-03-141-0/+5
|\ \ \
| * | | am doc: add a pointer to relevant hooksjn/am-doc-hooksJonathan Nieder2014-02-241-0/+5
| |/ /
* | | am: add the --gpg-sign optionNicolas Vigier2014-02-031-1/+5
|/ /
* | am: replace uses of --resolved with --continueKevin Bracey2013-06-271-2/+2
* | documentation: trivial style cleanupsFelipe Contreras2013-05-171-4/+3
* | Merge branch 'jb/am-include'Junio C Hamano2012-04-201-1/+2
|\ \
| * | am: support --include optionJohannes Berg2012-03-281-1/+2
* | | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-291-0/+3
|\ \ \ | |/ / |/| |
| * | am: learn passing -b to mailinfoThomas Rast2012-01-161-0/+3
* | | am: Document new --exclude=<path> optionmaximilian attems2011-08-091-1/+3
|/ /
* | Merge branch 'maint'Junio C Hamano2011-03-221-3/+3
|\ \
| * | git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'SZEDER Gábor2011-03-221-3/+3
* | | doc: drop author/documentation sections from most pagesJeff King2011-03-111-9/+0
|/ /
* | Use parentheses and `...' where appropriateŠtěpán Němec2010-10-081-2/+2
* | Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-101-1/+8
|\ \
| * | git-am: Add am.keepcr and --no-keep-cr to override itStefan-W. Hahn2010-02-281-2/+4
| * | git-am: Add command line parameter `--keep-cr` passing it to git-mailsplitStefan-W. Hahn2010-02-281-1/+6
* | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-041-1/+1
|\ \ \ | |/ / |/| |
| * | Remove extra '-' from git-am(1)Michal Sojka2010-03-041-1/+1
* | | am: switch --resolved to --continueJeff King2010-02-111-1/+2
* | | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-5/+5
|/ /
* | add documentation for mailinfo.scissors and '--no-scissors'Nicolas Sebrecht2009-09-111-1/+4
* | am/mailinfo: Disable scissors processing by defaultJunio C Hamano2009-08-261-11/+6
* | Documentation: describe the scissors mark support of "git am"Nanako Shiraishi2009-08-261-4/+12
|/
* git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-051-1/+4
* am, rebase: teach quiet optionStephen Boyd2009-06-181-1/+5
* git-am.txt: reword extra headers in message bodyStephen Boyd2009-05-051-4/+4
* git-am.txt: Use date or value instead of time or timestampStephen Boyd2009-05-051-4/+4
* git-am.txt: add an 'a', say what 'it' is, simplify a sentenceStephen Boyd2009-05-051-6/+6
* Documentation: minor grammatical fixes.David J. Mellor2009-03-021-18/+18
* git-am: Add --ignore-date optionNanako Shiraishi2009-01-251-1/+16
* git-am: implement --reject option passed to git-applymartin f. krafft2009-01-231-0/+2
* git-am: add --directory=<dir> optionJunio C Hamano2009-01-121-5/+2