summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2007-04-211-7/+20
|\ | | | | | | | | | | | | * maint: GIT 1.5.1.2 perl: install private Error.pm if the site version is older than our own git-clone: fix dumb protocol transport to clone from pack-pruned ref
| * GIT 1.5.1.2v1.5.1.2Junio C Hamano2007-04-211-7/+20
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-194-13/+20
|\ \ | |/ | | | | | | | | | | | | * maint: Update git-config documentation Fix unmatched emphasis tag in git-tutorial Update git-cherry-pick documentation Update git-archive documentation
| * Update git-config documentationAndrew Ruder2007-04-181-10/+14
| | | | | | | | | | | | | | | | Documentation/git-config.txt: Added documentation for --system Documentation/builtin-config.c: Added --system to the short usage Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix unmatched emphasis tag in git-tutorialAndrew Ruder2007-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In asciidoc 7.1.2 and prior there is no obvious way to get: 'add'ing to emphasize only the "add", instead it treats the first apostrophe as the beginning of an emphasis, and the second apostrophe as a regular apostrophe and makes the rest of the line an emphasis since there is no closing apostrophe. In the newer asciidoc you can do it pretty easily with __add__ing but I'm not sure it would be best to make that a prereq for something as silly as this. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Update git-cherry-pick documentationAndrew Ruder2007-04-181-1/+1
| | | | | | | | | | | | | | | | Documentation/git-cherry-pick.txt: Remove --replay as it is not handled by the code (-r is however). Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Update git-archive documentationAndrew Ruder2007-04-181-1/+4
| | | | | | | | | | | | | | | | Documentation/git-archive.txt: Document -v/--verbose option. Add -l as short form of --list. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-181-1/+1
|\ \ | |/ | | | | | | | | * maint: fix up strtoul_ui error handling git-tar-tree: complete deprecation conversion message
| * git-tar-tree: complete deprecation conversion messageSam Vilain2007-04-181-1/+1
| | | | | | | | | | | | | | The syntax for git-archive is different; warn about it in the deprecation message on the manual page. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-182-1/+7
|\ \ | |/ | | | | | | | | | | * maint: git-shortlog: Fix two formatting errors in asciidoc documentation Fix overwriting of files when applying contextually independent diffs git-svn: don't allow globs to match regular files
| * git-shortlog: Fix two formatting errors in asciidoc documentationFrank Lichtenheld2007-04-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | First use [verse] in the SYNOPSIS so that the line break actually shows. Secondly drop the quotes around '.mailmap' since this exposes a bug in our toolchain (didn't bother enough yet to find out wether it is asciidoc's fault or that of the XSL templates) that leads to the dot not getting escaped correctly in the roff output and thereby swallowing the line. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-svn: don't allow globs to match regular filesEric Wong2007-04-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git only tracks the histories of full directories, not that of individual files. Sometimes, SVN users will place[1] a regular file in the directory designated for subdirectories of branches or tags. Thanks to jrockway on #git for pointing this out. [1] mistakenly or otherwise, such as a README Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fl/cvsserver'Junio C Hamano2007-04-172-3/+130
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fl/cvsserver: config.txt: Add gitcvs.db* variables cvsserver: Document the GIT branches -> CVS modules mapping more prominently cvsserver: Reword documentation on necessity of write access cvsserver: Allow to "add" a removed file cvsserver: Add asciidoc documentation for new database backend configuration cvsserver: Corrections to the database backend configuration cvsserver: Use DBI->table_info instead of DBI->tables cvsserver: Abort if connect to database fails cvsserver: Make the database backend configurable cvsserver: Allow to override the configuration per access method cvsserver: Handle three part keys in git config correctly cvsserver: Introduce new state variable 'method' Conflicts: Documentation/config.txt
| * | config.txt: Add gitcvs.db* variablesFrank Lichtenheld2007-04-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds documentation for gitcvs.{dbname,dbdriver,dbuser,dbpass} Texts are mostly taken from git-cvsserver.txt whith some adaptions so that they make more sense out of the context of the original man page. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | cvsserver: Document the GIT branches -> CVS modules mapping more prominentlyFrank Lichtenheld2007-04-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about the branches -> modules mapping to LIMITATIONS because I really think it should be noted there and not just at the end of the installation step-by-step HOWTO. I used "git branches" there and changed "heads" to "branches" in my section about database configuration. I'm reluctant to replace all occourences of "head" with "branch" though because you always have to say "git branch" because CVS also has the concept of branches. You can say "head" though, because there is no such concept in CVS. In all the existing occourences of head other than the one I changed I think "head" flows better in the text. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | cvsserver: Reword documentation on necessity of write accessFrank Lichtenheld2007-04-121-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reworded the section about git-cvsserver needing to update the database. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | cvsserver: Add asciidoc documentation for new database backend configurationFrank Lichtenheld2007-04-081-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | Documents the new configuration variables and the variable substitution mechanism. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | cvsserver: Allow to override the configuration per access methodFrank Lichtenheld2007-03-221-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to override the gitcvs.enabled and gitcvs.logfile configuration variables for each access method (i.e. "ext" or "pserver") in the form gitcvs.<method>.<var> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Update draft release notes for 1.5.2 with accumulated changes.Junio C Hamano2007-04-171-1/+44
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-171-0/+37
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * maint: Start preparing for 1.5.1.2 git-svn: quiet some warnings when run only with --version/--help git-svn: respect lower bound of -r/--revision when following parent Conflicts: RelNotes
| * | Start preparing for 1.5.1.2Junio C Hamano2007-04-171-0/+37
| | |
* | | Add --ignore-unmatch option to exit with zero status when no files are removed.Steven Grimm2007-04-171-1/+4
| | | | | | | | | | | | | | | Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-169-133/+212
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Have sample update hook not refuse deleting a branch through push. variable $projectdesc needs to be set before checking against unchanged default. Update git-annotate/git-blame documentation Update git-apply documentation Update git-applymbox documentation Update git-am documentation user-manual: use detached head when rewriting history user-manual: start revising "internals" chapter user-manual: detached HEAD user-manual: fix discussion of default clone Documentation: clarify track/no-track option. Documentation: clarify git-checkout -f, minor editing Documentation: minor edits of git-lost-found manpage
| * | Update git-annotate/git-blame documentationAndrew Ruder2007-04-163-64/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved options that pertained to both git-blame and git-annotate to a common file blame-options.txt. builtin-blame.c: Removed --compatibility, --long, --time from the short usage as they are not handled in the code. Documentation/git-blame.txt: Removed common options to git-annotate. Added documentation for --score-debug. Removed --compatibility. Adjusted usage at top to not wrap on 80 columns. Documentation/git-annotate.txt: Using common options blame-options.txt. Documentation/blame-options.txt: Added -b note about associated config option, added --root note about associated config option, added documentation for --show-stats. Removed --long, --time, --rev-file as those options do not really exist. Added documentation for -M/-C taking an optional score argument for detection of moved lines. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Update git-apply documentationAndrew Ruder2007-04-161-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Document -v (short form of --verbose). Redo usage to not wrap on 80 column terminal with typical settings. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Update git-applymbox documentationAndrew Ruder2007-04-161-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-applymbox.txt: updating -u documentation to include fact that it encodes to the i18n.commitencoding setting, not just utf-8. Added documentation of -n option to pass -n to git-mailinfo. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Update git-am documentationAndrew Ruder2007-04-161-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | user-manual: use detached head when rewriting historyJ. Bruce Fields2007-04-161-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | This is slightly simpler if we use a detached head. And it's probably good to have another example that uses this feature. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | user-manual: start revising "internals" chapterJ. Bruce Fields2007-04-161-18/+20
| | | | | | | | | | | | | | | | | | | | | Minor revisions, cross-references. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | user-manual: detached HEADJ. Bruce Fields2007-04-161-2/+42
| | | | | | | | | | | | | | | | | | | | | Add a brief mention of detached HEADs and .git/HEAD. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | user-manual: fix discussion of default cloneJ. Bruce Fields2007-04-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The name "master" isn't actually quite so special. Also, fix some bad grammar. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Documentation: clarify track/no-track option.J. Bruce Fields2007-04-161-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the description of the --no-track option so it no longer says the opposite of what was intended. Also mention branch.autosetupmerge explicitly. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Documentation: clarify git-checkout -f, minor editingJ. Bruce Fields2007-04-161-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | "Force a re-read of everything" doesn't mean much to me. Also some minor grammar fixes. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Documentation: minor edits of git-lost-found manpageJ. Bruce Fields2007-04-161-12/+11
| | | | | | | | | | | | | | | | | | | | | Minor improvements to grammar and clarity of lost-found manpage. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add --quiet option to suppress output of "rm" commands for removed files.Steven Grimm2007-04-161-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add policy on user-interface changesAndrew Ruder2007-04-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Documentation/SubmittingPatches: Add note that all user interface changes should include associated documentation updates. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-151-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * maint: Document -g (--walk-reflogs) option of git-log sscanf/strtoul: parse integers robustly git-blame: Fix overrun in fake_working_tree_commit() [PATCH] Improve look-and-feel of the gitk tool. [PATCH] Teach gitk to use the user-defined UI font everywhere.
| * | Document -g (--walk-reflogs) option of git-logAlex Riesen2007-04-151-0/+5
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-141-3/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: git-quiltimport complaining yet still working config.txt: Fix grammatical error in description of http.noEPSV config.txt: Change pserver to server in description of gitcvs.* config.txt: Document core.autocrlf config.txt: Document gitcvs.allbinary Do not default to --no-index when given two directories. Use rev-list --reverse in git-rebase.sh
| * | config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld2007-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | s/doesn't/don't/ since "ftp servers" is plural Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld2007-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | These variables apply to the SSH access as well, so don't use pserver here which might confuse users. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | config.txt: Document core.autocrlfFrank Lichtenheld2007-04-131-0/+10
| | | | | | | | | | | | | | | | | | | | | Text shamelessly stolen from the 1.5.1 release notes. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | config.txt: Document gitcvs.allbinaryFrank Lichtenheld2007-04-131-0/+7
| | | | | | | | | | | | | | | Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: --cherry-pickJunio C Hamano2007-04-111-0/+15
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add %m to '--pretty=format:'Junio C Hamano2007-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When used with '--boundary A...B', this shows the -/</> marker you would get with --left-right option to 'git-log' family. When symmetric diff is not used, everybody is shown to be on the "right" branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add custom subject prefix support to format-patch (take 3)Robin H. Johnson2007-04-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new option to git-format-patch, entitled --subject-prefix that allows control of the subject prefix '[PATCH]'. Using this option, the text 'PATCH' is replaced with whatever input is provided to the option. This allows easily generating patches like '[PATCH 2.6.21-rc3]' or properly numbered series like '[-mm3 PATCH N/M]'. This patch provides the implementation and documentation. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-111-7/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * maint: GIT 1.5.1.1 cvsserver: Fix handling of diappeared files on update fsck: do not complain on detached HEAD. (encode_85, decode_85): Mark source buffer pointer as "const".
| * | GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-111-7/+22
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-04-101-0/+16
|\ \ \ | |/ / | | | | | | | | | | | | * maint: Documentation: show-ref: document --exclude-existing cvsexportcommit -p : fix the usage of git-apply -C.
| * | Documentation: show-ref: document --exclude-existingJulian Phillips2007-04-091-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Use the comment in the code to document the --exclude-existing function to git-show-ref. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status