kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Francis Daly	3070b603ab	Fix multi-paragraph list items in OPTIONS section This patch makes the html docs right, makes the asciidoc docs a bit odd but consistent with what is there already, and makes the manpages look OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69. For the manpages, current is like -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT With this patch, docbook-xsl v1.68 looks like -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT author and while docbook-xsl v1.69 becomes -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT author and The extra indentation is to keep the v1.69 manpage looking sane.	19 years ago
Matthias Urlichs	a541211ef4	cvsimport: Remove master-updating code The code which tried to update the master branch was somewhat broken. => People should do that manually, with "git merge". Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Andreas Ericsson	ffd97f3a35	git-cvsimport: Add -A <author-conv-file> option This patch adds the option to specify an author name/email conversion file in the format exon=Andreas Ericsson <ae@op5.se> spawn=Simon Pawn <spawn@frog-pond.org> which will translate the ugly cvs authornames to the more informative git style. The info is saved in $GIT_DIR/cvs-authors, so that subsequent incremental imports will use the same author-info even if no -A option is specified. If an -A option is specified, the info in $GIT_DIR/cvs-authors is appended/updated appropriately. Docs updated accordingly. Signed-off-by: Andreas Ericsson <ae@op5.se> 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
Nikolai Weibull	56e5e9170e	Documentation/git-cvsimport.txt: Fix a slight glitch in description heading. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Lukas_Sandström	5f3aa197ac	Change 'cache' to 'index' in the docs This patch makes the documentation refer to the index as index instead of cache, but some references still remain. (e.g. git-update-index.txt) Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	8e6ae4ad5f	Add -P to the documentation head. This is a companion patch for `211dcac643` commit, to add the newly introduced -P option to the list of options. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Martin Langhoff	211dcac643	cvsimport: introduce -P <cvsps-output-file> option -P:: <cvsps-output-file> Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Christian Meder	72e9340cfd	Convert usage of GIT and Git into git Convert usage of GIT and Git into git. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	98438bd0e8	Remove the version tags from the manpages Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Jonas Fonseca	df8baa42fe	[PATCH] Random documentation fixes The fixes focuses on improving the HTML output. Most noteworthy: - Fix the Makefile to also make various *.html files depend on included files. - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional info. - Fix ending '::' for description lists in OPTION section etc. - Fix paragraphs in description lists ending up as preformated text. - Always use listingblocks (preformatted text wrapped in lines with -----) for examples that span empty lines, so they are put in only one HTML block. - Use '1.' instead of '(1)' for numbered lists. - Fix linking to other GIT docs. - git-rev-list.txt: put option descriptions in an OPTION section. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Sergey Vlasov	a7154e916c	[PATCH] Documentation: Update all files to use the new gitlink: macro The replacement was performed automatically by these commands: perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \ README Documentation/.txt perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \ README Documentation/.txt Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	215a7ad1ef	Big tool rename. As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
H. Peter Anvin	0d821d4dab	[PATCH] git-cvsimport-script: handling of tags This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Martin Langhoff	db4b65821e	[PATCH] Add merge detection to git-cvsimport Added -m and -M flags for git-cvsimport to detect merge commits in cvs. While this trusts the commit message, in repositories where merge commits indicate 'merged from FOOBRANCH' the import works surprisingly well. Even if some merges from CVS are bogus or incomplete, the resulting branches are in better state to go forward (and merge) than without any merge detection. Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Johannes Schindelin	fbfd60d651	[PATCH] Also handle CVS branches with a '/' in their name I track a CVS project which has a branch with a '/' in the branch name. Since git wants the branch name to be a file name at the same time, substitute that character to a '-' by default (override with "-s <subst>"). This should work well, despite the fact that a division and a difference are completely different :-) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Martin Langhoff	abe0582207	[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. After exploration of the different -k modes in the cvs protocol, we use -kk which kills keyword expansion wherever possible. Against the protocol spec, -ko and -kb will sometimes expand keywords. Should improve our chances of detecting merges and reduce imported repository size. Signed-off: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
iso-8859-1?Q?David_K=E5gedal	b092133103	[PATCH] Fixed two bugs in git-cvsimport-script. The git-cvsimport-script had a copule of small bugs that prevented me from importing a big CVS repository. The first was that it didn't handle removed files with a multi-digit primary revision number. The second was that it was asking the CVS server for "F" messages, although they were not handled. I also updated the documentation for that script to correspond to actual flags. Signed-off-by: David K?5gedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Sven Verdoolaege	c1c774e796	[PATCH] git-cvsimport-script: add "import only" option git-cvsimport-script: add "import only" option which tells the script not to perform a checkout after importing. This ensures that the working directory and cache remain untouched and will not create them if they do not exist. Acked-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Sven Verdoolaege	34155390a5	Support :ext: access method.	20 years ago
Sven Verdoolaege	a92bebe697	git-cvsimport-script: clean up documentation Remove documentation of irrelevant "type" option. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>	20 years ago
Sven Verdoolaege	f9714a4a0c	Make specification of CVS module to convert optional. If we're inside a checked out CVS repository, there is no need to explicitly specify the module as it is available in CVS/Repository. Also read CVS/Root if it's available and -d is not specified. Finally, explicitly pass root to cvsps as CVS/Root takes precedence over CVSROOT. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>	20 years ago
Sven Verdoolaege	1cd3674add	Fixed a typo in Documentation/git-cvsimport-script.txt.	20 years ago
Matthias Urlichs	f21140605c	cvsimport: add documentation.	20 years ago

13 Commits (dfa464781286e3a6fb1d56a834bb15ac7fc4fb16)