summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2007-04-18Update git-config documentationLibravatar Andrew Ruder1-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>
2007-04-18Fix unmatched emphasis tag in git-tutorialLibravatar Andrew Ruder1-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>
2007-04-18Update git-cherry-pick documentationLibravatar Andrew Ruder1-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>
2007-04-18Update git-archive documentationLibravatar Andrew Ruder1-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>
2007-04-18git-tar-tree: complete deprecation conversion messageLibravatar Sam Vilain1-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>
2007-04-18git-shortlog: Fix two formatting errors in asciidoc documentationLibravatar Frank Lichtenheld1-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>
2007-04-18git-svn: don't allow globs to match regular filesLibravatar Eric Wong1-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>
2007-04-17Start preparing for 1.5.1.2Libravatar Junio C Hamano1-0/+37
2007-04-16Update git-annotate/git-blame documentationLibravatar Andrew Ruder3-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>
2007-04-16Update git-apply documentationLibravatar Andrew Ruder1-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>
2007-04-16Update git-applymbox documentationLibravatar Andrew Ruder1-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>
2007-04-16Update git-am documentationLibravatar Andrew Ruder1-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>
2007-04-16user-manual: use detached head when rewriting historyLibravatar J. Bruce Fields1-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>
2007-04-16user-manual: start revising "internals" chapterLibravatar J. Bruce Fields1-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>
2007-04-16user-manual: detached HEADLibravatar J. Bruce Fields1-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>
2007-04-16user-manual: fix discussion of default cloneLibravatar J. Bruce Fields1-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>
2007-04-16Documentation: clarify track/no-track option.Libravatar J. Bruce Fields1-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>
2007-04-16Documentation: clarify git-checkout -f, minor editingLibravatar J. Bruce Fields1-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>
2007-04-16Documentation: minor edits of git-lost-found manpageLibravatar J. Bruce Fields1-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>
2007-04-15Document -g (--walk-reflogs) option of git-logLibravatar Alex Riesen1-0/+5
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-13config.txt: Fix grammatical error in description of http.noEPSVLibravatar Frank Lichtenheld1-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>
2007-04-13config.txt: Change pserver to server in description of gitcvs.*Libravatar Frank Lichtenheld1-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>
2007-04-13config.txt: Document core.autocrlfLibravatar Frank Lichtenheld1-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>
2007-04-13config.txt: Document gitcvs.allbinaryLibravatar Frank Lichtenheld1-0/+7
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-11GIT 1.5.1.1Libravatar Junio C Hamano1-7/+22
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-09Documentation: show-ref: document --exclude-existingLibravatar Julian Phillips1-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>
2007-04-08Add Documentation/cmd-list.made to .gitignoreLibravatar Junio C Hamano1-0/+1
Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-07Prepare for 1.5.1.1Libravatar Junio C Hamano1-0/+46
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-07cvsserver: small corrections to asciidoc documentationLibravatar Frank Lichtenheld1-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>
2007-04-06Documentation: tighten dependency for git.{html,txt}Libravatar Junio C Hamano2-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>
2007-04-06usermanual.txt: some capitalization nitsLibravatar Arjen Laarhoven1-4/+4
Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-06cvsimport: Improve formating consistencyLibravatar Frank Lichtenheld1-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>
2007-04-06cvsimport: Reorder options in documentation for better understandingLibravatar Frank Lichtenheld1-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>
2007-04-06cvsimport: Improve documentation of CVSROOT and CVS module determinationLibravatar Frank Lichtenheld1-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>
2007-04-06cvsimport: sync usage lines with existing optionsLibravatar Frank Lichtenheld1-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>
2007-04-05Document --left-right option to rev-list.Libravatar Brian Gernhardt1-0/+31
Explanation is paraphrased from "577ed5c... rev-list --left-right" Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-03GIT 1.5.1Libravatar Junio C Hamano2-15/+186
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-03Merge 1.5.0.7 inLibravatar Junio C Hamano1-0/+18
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-03GIT 1.5.0.7Libravatar Junio C Hamano1-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>
2007-04-03Documentation: A few minor fixes to Git User's ManualLibravatar Jakub Narebski1-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>
2007-04-02Hopefully final update to the draft Release Notes, preparing for 1.5.1Libravatar Junio C Hamano1-8/+15
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-31cvsserver: Don't lie about binary mode in asciidoc documentationLibravatar Frank Lichtenheld1-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>
2007-03-30Update draft release notes for 1.5.1Libravatar Junio C Hamano1-1/+6
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-29Merge branch 'maint'Libravatar Junio C Hamano2-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.
2007-03-29Merge branch 'master' of git://repo.or.cz/git/mergetool.gitLibravatar Junio C Hamano1-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
2007-03-29Fix minor formatting issue in man page for git-mergetoolLibravatar Theodore Ts'o1-5/+5
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-03-29Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.Libravatar Gerrit Pape1-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>
2007-03-29Documentation/git-svnimport.txt: fix typo.Libravatar Gerrit Pape1-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>
2007-03-28Update main git.html page to point at 1.5.0.6 documentationLibravatar Junio C Hamano1-1/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-28Merge branch 'maint' to synchronize with 1.5.0.6Libravatar Junio C Hamano1-0/+22
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:37:03 +0000