aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Documentation: robustify asciidoc GIT_VERSION replacementJeff King2007-06-02
| | | | | | | | | | | | Instead of using sed on the resulting file, we now have a git_version asciidoc attribute. This means that we don't pipe the output of asciidoc, which means we can detect build failures. Problem reported by Scott Lamb, solution suggested by Jonas Fonseca. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-31
|\ | | | | | | | | | | | | | | * maint-1.5.1: git-config: Improve documentation of git-config file handling git-config: Various small fixes to asciidoc documentation decode_85(): fix missing return. fix signed range problems with hex conversions
| * git-config: Improve documentation of git-config file handlingFrank Lichtenheld2007-05-30
| | | | | | | | | | | | | | | | | | The description which files git-config uses and how the various command line options and environment variables affect its behaviour was incomplete, outdated and confusing. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-config: Various small fixes to asciidoc documentationFrank Lichtenheld2007-05-30
| | | | | | | | | | | | | | | | | | | | | | Add '' around the only mentioned commandline option that didn't have it. Make reference to section EXAMPLE a link and rename it to EXAMPLES because it actually contains a lot of examples. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsserver: Fix some typos in asciidoc documentationFrank Lichtenheld2007-05-29
| | | | | | | | | | Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsserver: Note that CVS_SERVER can also be specified as method variableFrank Lichtenheld2007-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasonably new versions of the cvs CLI client allow one to specifiy CVS_SERVER as a method variable directly in CVSROOT. This is way more convinient than using an environment variable since it gets saved in CVS/Root. Since I only discovered this by accident I guess there might be others out there that learnt CVS on the 1.11 series (or even earlier) and profit from such a note about cvs improvements in the last couple years. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsserver: Correct inetd.conf example in asciidoc documentationFrank Lichtenheld2007-05-29
| | | | | | | | | | | | | | | | | | | | While the given example worked, it made us look rather incompetent. Give the correct reason why one needs the more complex syntax and change the example to reflect that. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | user-manual: fixed typo in exampleSteffen Prohaska2007-05-28
| | | | | | | | | | Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * maint-1.5.1: Fix git-svn to handle svn not reporting the md5sum of a file, and test. More echo "$user_message" fixes. Add tests for the last two fixes. git-commit: use printf '%s\n' instead of echo on user-supplied strings git-am: use printf instead of echo on user-supplied strings Documentation: Add definition of "evil merge" to GIT Glossary Replace the last 'dircache's by 'index' Documentation: Clean up links in GIT Glossary
| * Documentation: Add definition of "evil merge" to GIT GlossaryJakub Narebski2007-05-25
| | | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Replace the last 'dircache's by 'index'Jakub Narebski2007-05-25
| | | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: Clean up links in GIT GlossaryJakub Narebski2007-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the same link is not repeated in single glossary entry, and that there is no self-link i.e. link to current entry. Add links to other definitions in git glossary. Remove inappropriate (nonsense) links, or change link to link to correct definition (to correct term). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-23
|\ \ | |/ | | | | | | * maint-1.5.1: Documentation: fix git-config.xml generation
| * Documentation: fix git-config.xml generationJames Bowes2007-05-23
| | | | | | | | | | Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-23
|\ \ | |/ | | | | | | * maint-1.5.1: Document branch.autosetupmerge.
| * Document branch.autosetupmerge.Paolo Bonzini2007-05-22
| | | | | | | | | | | | | | | | This patch documents the branch.autosetupmerge config option, added by commit 0746d19a. Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-21
|\ \ | |/ | | | | | | | | | | * maint-1.5.1: git-status: respect core.excludesFile SubmittingPatches: mention older C compiler compatibility git-daemon: don't ignore pid-file write failure
| * git-status: respect core.excludesFileJohannes Schindelin2007-05-21
| | | | | | | | | | | | | | | | | | | | git-add reads this variable, and honours the contents of that file if that exists. Match this behaviour in git-status, too. Noticed by Evan Carroll on IRC. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * SubmittingPatches: mention older C compiler compatibilityJohannes Schindelin2007-05-21
| | | | | | | | | | | | | | | | We do not appreciate C99 initializers, declarations after statements, or "0" instead of "NULL". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-20
|\ \ | |/ | | | | | | | | | | | | | | | | * maint-1.5.1: annotate: make it work from subdirectories. git-config: Correct asciidoc documentation for --int/--bool t1300: Add tests for git-config --bool --get unpack-trees.c: verify_uptodate: remove dead code Use PATH_MAX instead of TEMPFILE_PATH_LEN branch: fix segfault when resolving an invalid HEAD
| * git-config: Correct asciidoc documentation for --int/--boolFrank Lichtenheld2007-05-20
| | | | | | | | | | | | | | | | | | The asciidoc documentation seemed to indicate that type specifiers are honoured on writing operations which they aren't. Make this more clear. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.5.2v1.5.2Junio C Hamano2007-05-20
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint' to synchronize with 1.5.1.6Junio C Hamano2007-05-20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: GIT 1.5.1.6 git-svn: don't minimize-url when doing an init that tracks multiple paths git-svn: avoid crashing svnserve when creating new directories user-manual: Add section on ignoring files user-manual: finding commits referencing given file content user-manual: discourage shared repository tutorial: revise index introduction tutorials: add user-manual links Conflicts: GIT-VERSION-GEN RelNotes
| * GIT 1.5.1.6v1.5.1.6Junio C Hamano2007-05-20
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * user-manual: Add section on ignoring filesJohan Herland2007-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The todo list at the end of the user manual says that something must be said about .gitignore. Also, there seems to be a lack of documentation on how to choose between the various types of ignore files (.gitignore vs. .git/info/exclude, etc.). This patch adds a section on ignoring files which try to introduce how to tell git about ignored files, and how the different strategies complement eachother. The syntax of exclude patterns is explained in a simplified manner, with a reference to git-ls-files(1) which already contains a more thorough explanation. Signed-off-by: Johan Herland <johan@herland.net>
| * user-manual: finding commits referencing given file contentJ. Bruce Fields2007-05-19
| | | | | | | | | | | | | | Another amusing git exploration example brought up in irc. (Credit to aeruder for the complete solution.) Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| * user-manual: discourage shared repositoryJ. Bruce Fields2007-05-19
| | | | | | | | | | | | | | | | | | I don't really want to look like we're encouraging the shared repository thing. Take down some of the argument for using purely single-developer-owned repositories and collaborating using patches and pulls instead. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| * tutorial: revise index introductionJ. Bruce Fields2007-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The embarassing history of this tutorial is that I started it without really understanding the index well, so I avoided mentioning it. And we all got the idea that "index" was a word to avoid using around newbies, but it was reluctantly mentioned that *something* had to be said. The result is a little awkward: the discussion of the index never actually uses that word, and isn't well-integrated into the surrounding material. Let's just go ahead and use the word "index" from the very start, and try to demonstrate its use with a minimum of lecturing. Also, remove discussion of using git-commit with explicit filenames. We're already a bit slow here to get people to their first commit, and I'm not convinced this is really so important. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| * tutorials: add user-manual linksJ. Bruce Fields2007-05-19
| | | | | | | | | | | | | | | | | | Mention the user manual, especially as an alternative introduction for user's mainly interested in read-only operations. And fix a typo while we're there. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
* | Merge branch 'maint'Junio C Hamano2007-05-18
|\ \ | |/ | | | | | | | | * maint: Documentation: Reformatted SYNOPSIS for several commands Documentation: Added [verse] to SYNOPSIS where necessary
| * Documentation: Reformatted SYNOPSIS for several commandsMatthias Kestenholz2007-05-18
| | | | | | | | | | Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: Added [verse] to SYNOPSIS where necessaryMatthias Kestenholz2007-05-18
| | | | | | | | | | Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation/git.txt: Update links to older documentation pages.Junio C Hamano2007-05-18
| | | | | | | | | | | | | | It's starting to take too much space at the beginning of the main documentation page. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add link to 1.5.1.5 release notes.Junio C Hamano2007-05-18
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge 1.5.1.5 inJunio C Hamano2007-05-18
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * GIT v1.5.1.5v1.5.1.5Junio C Hamano2007-05-18
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano2007-05-18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: reorganize public git repo discussion user-manual: listing commits reachable from some refs not others user-manual: introduce git user-manual: add a "counting commits" example user-manual: move howto/using-topic-branches into manual user-manual: move howto/make-dist.txt into user manual Documentation: remove howto's now incorporated into manual user-manual: move quick-start to an appendix glossary: expand and clarify some definitions, prune cross-references user-manual: revise birdseye-view chapter Add a birdview-on-the-source-code section to the user manual
| | * user-manual: reorganize public git repo discussionJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helping a couple people set up public repos recently, I wanted to point them at this piece of the user manual, but found it wasn't as helpful as it could be: - It starts with a big explanation of why you'd want a public repository, not necessary in their case since they already knew why they wanted that. So, separate that out. - It skimps on some of the git-daemon details, and puts the http export information first. Fix that. Also group all the public repo subsections into a single section, and do some miscellaneous related editing. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: listing commits reachable from some refs not othersJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | This is just an amusing example raised by someone in irc. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: introduce gitJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | Well, we should say at least something about what git is. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: add a "counting commits" exampleJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | This is partly just an excuse to mention --pretty= and rev-list. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: move howto/using-topic-branches into manualJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move howto/using-topic-branches into the user manual as an example for the "sharing development" chapter. While we're at it, remove some discussion that's covered in earlier chapters, modernize somewhat (use separate-heads setup, remotes, replace "whatchanged" by "log", etc.), and replace syntax we'd need to explain by syntax we've already covered (e.g. old..new instead of new ^old). The result may not really describe what Tony Luck does any more.... Hope that's not annoying. Cc: Tony Luck <tony.luck@intel.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: move howto/make-dist.txt into user manualJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be a perception that the howto's are bit-rotting a little. The manual might be a more visible location for some of them, and make-dist.txt seems like a good candidate to include as an example in the manual. For now, incorporate much of it verbatim. Later we may want to update the example a bit. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * Documentation: remove howto's now incorporated into manualJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | These two howto's have both been copied into the manual. I'd rather not maintain both versions if possible, and I think the user-manual will be more visible than the howto directory. (Though I wouldn't mind some duplication if people really like having them here.) Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: move quick-start to an appendixJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | | | | | | | The quick start interrupts the flow of the manual a bit. Move it to "appendix A" but add a reference to it in the preface. Also rename the todo chapter to "appendix B", and revise the preface a little. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * glossary: expand and clarify some definitions, prune cross-referencesJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise and expand some of the definitions in the glossary, based in part on a recent thread started by a user looking for help with some of the jargon. I've borrowed some of the language from Linus's email on that thread. (I'm assuming standing permission to plagiarize Linus's email....) Also start making a few changes to mitigate the appearance of "circularity" mentioned in that thread: - feel free to use somewhat longer definitions and to explain some things more than once instead of relying purely on cross-references - don't use cross-references when they're redundant: eliminate self-references and repeated references to the same entry. Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * user-manual: revise birdseye-view chapterJ. Bruce Fields2007-05-17
| | | | | | | | | | | | | | | | | | | | | | | | Some revisions suggested by Junio along with some minor style fixes and one compile fix (asterisks need escaping). Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| | * Add a birdview-on-the-source-code section to the user manualJohannes Schindelin2007-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In http://thread.gmane.org/gmane.comp.version-control.git/42479, a birdview on the source code was requested. J. Bruce Fields suggested that my reply should be included in the user manual, and there was nothing of an outcry, so here it is, not 2 months later. It includes modifications as suggested by J. Bruce Fields, Karl Hasselström and Daniel Barkalow. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
| * | Documentation: git-rev-list's "patterns"Petr Baudis2007-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | git-rev-list(1) talks about patterns as values for the --grep, --committed etc. parameters, without going into detail. This patch mentions that these patterns are actually regexps. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-05-17
|\ \ \ | |/ / | | | | | | | | | | | | * maint: Document core.excludesfile for git-add git-send-email: allow leading white space on mutt aliases
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 19:09:03 +0000