summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
Commit message (Collapse)AuthorAgeFilesLines
* git-am: --binary; document --resume and --binary.Junio C Hamano2005-11-171-8/+16
| | | | | | | | | | | Now git-apply can grok binary replacement patches, give --binary flag to git-am. As a safety measure, this is not by default enabled, so that you do not let malicious e-mailed patch to replace an arbitrary path with just a couple of lines (diff index lines, the filename and string "Binary files "...) by accident. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am.txt is no stub anymorePetr Baudis2005-11-011-2/+0
| | | | | | | | | That notice was added by me for the emergency documentation, but Junio already expanded it to a full-fledged manual page. This patch removes the notice. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am: make it easier after fixing up an unapplicable patch.Junio C Hamano2005-10-251-4/+4
| | | | | | | Instead of having the user to edit the mail message, let the hand merge result stored in .dotest/patch and continue, which is easier to manage. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix malformatted git-am documentation.Junio C Hamano2005-10-211-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Finish git-am documentation.Junio C Hamano2005-10-201-10/+49
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Brief documentation for the mysterious git-am scriptPetr Baudis2005-10-201-0/+51
The git-am script is nowhere called and nowhere (including itself) explained, and the name isn't helpful either. For those like me who will wonder what is it about, add some documentation stub for it to the documentation. I probably got something wrong and I don't feel like investigating all the options - this is just kind of "emergency" docs. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status