summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
* git-am: ignore --binary optionStephan Beyer2008-08-161-6/+1
* Rename .git/rebase to .git/rebase-applyJohannes Schindelin2008-07-211-2/+2
* Update my e-mail addressJunio C Hamano2008-07-211-1/+1
* git am --abortNanako Shiraishi2008-07-191-1/+4
* Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-151-2/+2
* Merge branch 'jc/rebase-orig-head'Junio C Hamano2008-07-141-0/+6
|\
| * Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt2008-07-081-0/+6
* | git-am/git-mailsplit: correct synopsis for reading from stdinStephan Beyer2008-07-131-2/+2
|/
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-7/+7
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-011-2/+2
* Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer2008-06-081-8/+16
* documentation: move git(7) to git(1)Christian Couder2008-06-061-1/+1
* am: remove support for -d .dotestJunio C Hamano2008-03-051-5/+1
* Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotestBryan Donlan2008-02-251-1/+1
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-061-8/+8
* War on whitespaceJunio C Hamano2007-06-071-1/+0
*-. Merge branches 'lh/submodules' and 'pb/am'Junio C Hamano2007-06-021-3/+2
|\ \
View Lorry Controller Status