summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Start preparing for 1.5.1.2Junio C Hamano2007-04-171-0/+37
|
* 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>
* 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>
* 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>
* GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-111-7/+22
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* 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>
* Add Documentation/cmd-list.made to .gitignoreJunio C Hamano2007-04-081-0/+1
| | | | | | Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Prepare for 1.5.1.1Junio C Hamano2007-04-071-0/+46
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsserver: small corrections to asciidoc documentationFrank Lichtenheld2007-04-071-4/+4
| | | | | | | | | | Fix a typo: s/Not/Note/ Some formating fixes: Use ` ` syntax for all filenames and ' ' syntax for all commandline switches. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: tighten dependency for git.{html,txt}Junio C Hamano2007-04-062-4/+17
| | | | | | | | | Every time _any_ documentation page changed, cmds-*.txt files were regenerated, which caused git.{html,txt} to be remade. Try not to update cmds-*.txt files if their new contents match the old ones. Signed-off-by: Junio C Hamano <junkio@cox.net>
* usermanual.txt: some capitalization nitsArjen Laarhoven2007-04-061-4/+4
| | | | | Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: Improve formating consistencyFrank Lichtenheld2007-04-061-3/+3
| | | | | | | Use ' ' syntax for all commandline options mentioned in text. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: Reorder options in documentation for better understandingFrank Lichtenheld2007-04-061-27/+27
| | | | | | | | | The current order the options are documented in makes no sense at all to me. Reorder them so that similar options are grouped together and also order them somehwhat by importance. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: Improve documentation of CVSROOT and CVS module determinationFrank Lichtenheld2007-04-061-2/+6
| | | | | | | | | | Document the fact that git-cvsimport tries to find out CVSROOT from CVS/Root and $ENV{CVSROOT} and CVS_module from CVS/Repository. Also use ` ` syntax for all filenames for consistency. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: sync usage lines with existing optionsFrank Lichtenheld2007-04-061-3/+5
| | | | | | | | | | Sync both the usage lines in the code and the asciidoc documentation with the real list of options. While all options seems to be documented in the asciidoc document, not all of them were listed in the usage line. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document --left-right option to rev-list.Brian Gernhardt2007-04-051-0/+31
| | | | | | Explanation is paraphrased from "577ed5c... rev-list --left-right" Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.1v1.5.1Junio C Hamano2007-04-032-15/+186
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge 1.5.0.7 inJunio C Hamano2007-04-031-0/+18
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * GIT 1.5.0.7v1.5.0.7Junio C Hamano2007-04-031-0/+18
| | | | | | | | | | | | | | | | Not that this release really matters, as we will be doing 1.5.1 tomorrow. This commit is to tie the loose ends and merge all of "maint" branch into "master" in preparation. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: A few minor fixes to Git User's ManualJakub Narebski2007-04-031-10/+10
| | | | | | | | | | | | | | | | Mainly consistent usage of "git command" and not "git-command" syntax Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Hopefully final update to the draft Release Notes, preparing for 1.5.1Junio C Hamano2007-04-021-8/+15
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld2007-03-311-3/+5
| | | | | | | | | | | | | | | | | | | | The git-cvsserver documentation claims that the server will set -k modes if appropriate which is not really the case. On the other hand the available gitcvs.allbinary variable is not documented at all. Fix both these issues by rewording the related paragraph. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update draft release notes for 1.5.1Junio C Hamano2007-03-301-1/+6
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-03-292-9/+9
|\ \ | |/ | | | | | | | | | | * maint: git-upload-pack: make sure we close unused pipe ends Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES. Documentation/git-svnimport.txt: fix typo.
| * Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.Gerrit Pape2007-03-291-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please see http://bugs.debian.org/404795: In git-rev-parse(1), there is an example commit tree, which is used twice. The explanation for this tree is very clear: B and C are commit *parents* to A. However, when the tree is reused as an example in the SPECIFYING RANGES, the manpage author screws up and uses A as a commit *parent* to B and C! I.e., he inverts the tree. And the fact that for this example you need to read the tree backwards is not explained anywhere (and it would be confusing even if it was). Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation/git-svnimport.txt: fix typo.Gerrit Pape2007-03-291-1/+1
| | | | | | | | | | | | | | | | This was noticed by Frederik Schwarzer. SVN's repository by default has trunk, tags/, and branch_es_/. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'master' of git://repo.or.cz/git/mergetool.gitJunio C Hamano2007-03-291-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/mergetool.git: mergetool: Clean up description of files and prompts for merge resolutions mergetool: Make git-rm quiet when resolving a deleted file conflict mergetool: Add support for Apple Mac OS X's opendiff command mergetool: Fix abort command when resolving symlinks and deleted files mergetool: Remove spurious error message if merge.tool config option not set mergetool: factor out common code mergetool: portability fix: don't use reserved word function mergetool: portability fix: don't assume true is in /bin mergetool: Don't error out in the merge case where the local file is deleted mergetool: Replace use of "echo -n" with printf(1) to be more portable Fix minor formatting issue in man page for git-mergetool
| * | Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-291-5/+5
| | | | | | | | | | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* | | Update main git.html page to point at 1.5.0.6 documentationJunio C Hamano2007-03-281-1/+3
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint' to synchronize with 1.5.0.6Junio C Hamano2007-03-281-0/+22
|\ \ \ | | |/ | |/|
| * | GIT 1.5.0.6v1.5.0.6Junio C Hamano2007-03-281-0/+22
| | |
* | | Document git-log --first-parentJunio C Hamano2007-03-271-0/+5
| |/ |/| | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.5.1-rc2v1.5.1-rc2Junio C Hamano2007-03-251-13/+40
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-03-254-453/+416
|\ \ | |/ | | | | | | | | | | | | | | | | * maint: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option
| * Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano2007-03-254-453/+416
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option
| | * user-manual: introduce "branch" and "branch head" differentlyJ. Bruce Fields2007-03-181-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was using "branch" to mean "head", but that's perhaps a little sloppy; so instead start by using the terms "branch head" and "head", while still quickly falling back on "branch", since that's what people actually say more frequently. Also include glossary references on the first uses of "head" and "tag". Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
View Lorry Controller Status