kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Frank Lichtenheld	870e0d61d3	git-am: Clean up the asciidoc documentation Add --keep to synopsis. The synopsys used a mix of tabs and spaces, unify to use only spaces. Shuffle options around in synopsys and description for grouping them logically. Add more gitlink references to other commands. Various grammatical fixes and improvements. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Andrew Ruder	5c19f244c3	Update git-am documentation Documentation/git-am.txt missing several short versions of options. Added documentation for --resolvemsg=<msg> command-line option. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Junio C Hamano	2499857b0b	git-am documentation: describe what is taken from where. Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Michael S. Tsirkin	a947ab79d4	fix typo in git-am manpage Fix typo in git-am manpage Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Junio C Hamano	2092a1fefd	Teach git-am to pass -p option down to git-apply This is originally from Andy Parkins whose patch used --patchdepth; let's use -p which is more in line with the underlying git-apply. Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Michael S. Tsirkin	d414461295	Document that git-am can read standard input. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Michael S. Tsirkin	67dad687ad	add -C[NUM] to git-am Add -C[NUM] to git-am and git-rebase so that patches can be applied even if context has changed a bit. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Junio C Hamano	c3f0baacad	Documentation: sync git.txt command list and manual page title Also reorders a handful entries to make each list sorted alphabetically. Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Junio C Hamano	d84029b673	--utf8 is now default for 'git-am' Since we are talking about allowing potentially incompatible UI changes in v1.5.0 iff the change improves the general situation, I would say why not. There is --no-utf8 flag to avoid re-coding from botching the log message just in case, but we may not even need it. Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Junio C Hamano	8273c79ae2	war on whitespaces: documentation. We were missing the --whitespace option in the usage string for git-apply and git-am, so this commit adds them. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Jonas Fonseca	353ce81597	Wrap synopsis lines and use [verse] to keep formatting In addition, also fixes a few synopses to be more consistent and a gitlink. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	1e2ccd3abc	Documentation: more examples. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Nikolai Weibull	68e37f8402	Fix the description of --utf8 and --keep to git-am. The git-am script actually transform --utf8 and --keep to -u and -k when sent to git-mailinfo. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	087b6742fc	git-am: --binary; document --resume and --binary. 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>	19 years ago
Petr Baudis	085c1e2212	git-am.txt is no stub anymore 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>	19 years ago
Junio C Hamano	271440e3b6	git-am: make it easier after fixing up an unapplicable patch. 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>	19 years ago
Junio C Hamano	05625af32e	Fix malformatted git-am documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	baa720f501	Finish git-am documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Petr Baudis	42e2cba204	Brief documentation for the mysterious git-am script 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>	19 years ago

19 Commits (8299886619b8dab99773b5810f50c63a50b2d611)