aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Merge branch 'maint'Junio C Hamano2007-05-16
|\ | | | | | | | | | | | | | | | | * maint: format-patch: add MIME-Version header when we add content-type. Fixed link in user-manual import-tars: Use the "Link indicator" to identify directories git name-rev writes beyond the end of malloc() with large generations Documentation/branch: fix small typo in -D example
| * Fixed link in user-manualSteffen Prohaska2007-05-16
| | | | | | | | | | | | | | link to git-mergetool was broken. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation/branch: fix small typo in -D exampleQuy Tonthat2007-05-14
| | | | | | | | | | Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent ↵Andy Parkins2007-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with other VCSs $Id$ is present already in SVN and CVS; it would mean that people converting their existing repositories won't have to make any changes to the source files should they want to make use of the ident attribute. Given that it's a feature that's meant to calm those very people, it seems obtuse to make them edit every file just to make use of it. I think that bzr uses $Id$; Mercurial has examples hooks for $Id$; monotone has $Id$ on its wishlist. I can't think of a good reason not to stick with the de-facto standard and call ours $Id$ instead of $ident$. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-14
|\ \ | |/ | | | | | | | | | | | | | | | | * maint: Prepare for 1.5.1.5 Release Notes gitweb: Add a few comments about %feature hash git-am: Clean up the asciidoc documentation Documentation: format-patch has no --mbox option builtin-log.c: Fix typo in comment Fix git-clone buglet for remote case.
| * Prepare for 1.5.1.5 Release NotesJunio C Hamano2007-05-14
| | | | | | | | | | | | | | Hopefully we will have 1.5.2 soonish, to contain all of these, but we should summarize what we have done regardless. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-am: Clean up the asciidoc documentationFrank Lichtenheld2007-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --keep to synopsis. The synopsys used a mix of tabs and spaces, unify to use only spaces. Shuffle options around in synopsys and description for grouping them logically. Add more gitlink references to other commands. Various grammatical fixes and improvements. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: format-patch has no --mbox optionFrank Lichtenheld2007-05-14
| | | | | | | | | | | | | | | | | | | | | | git-applymbox and git-mailinfo refer to a --mbox option of git-format-patch when talking about their -k options. But there is no such option. What -k does to the former two commands is to keep the Subject: lines unmunged, meant to be used on output generated with format-patch -k. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation/git-add: clarify -u with path limitingJeff King2007-05-13
| | | | | | | | | | Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: Split description of pretty formats of commit logJakub Narebski2007-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split description of pretty formats into list of pretty options (--pretty and --encoding) in new file Documentation/pretty-options.txt and description of formats itself as a separate "PRETTY FORMATS" section in pretty-formats.txt While at it correct formatting a bit, to be better laid out in the resulting manpages: git-rev-list(1), git-show(1), git-log(1) and git-diff-tree(1). Those manpages now include pretty options in the same place as it was before, and description of formats just after all options. Inspired by the split into two filesdocumentation for merge strategies: Documentation/merge-options.txt and Documentation/merge-strategies.txt Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Link to HTML version of external doc if availableJunio C Hamano2007-05-13
| | | | | | | | | | | | | | | | | | | | | | | | Currently $ git grep '\([^t]\|^\)'link: user-manual.txt gives four hits that refer to .txt version of the documentation set, but at least "hooks" and "cvs-migration" have HTML variants installed, so refer to them instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Minor fixup to documentation of hooks in git-receive-pack.Jan Hudec2007-05-12
| | | | | | | | | | | | | | | | | | | | | | Small additional changes to the cbb84e5d174cf33fd4dcf3136de50a886ff9a2e2 commit, which introduced documentation to pre-receive and post-receive: - Mention that stdout and stderr are equivalent. - Add one cross-section link and fix one other. - Fix information on advantages of post-receive over post-update. Signed-off-by: Jan Hudec <bulb@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-12
|\ \ | |/ | | | | | | | | | | | | | | * maint: checkout: allow detaching to HEAD even when switching to the tip of a branch Updated documentation of hooks in git-receive-pack. Allow fetching references from any namespace tiny fix in documentation of git-clone Fix an unmatched comment end in arm/sha1_arm.S
| * Updated documentation of hooks in git-receive-pack.Jan Hudec2007-05-12
| | | | | | | | | | | | | | | | | | | | Added documentation of pre-receive and post-receive hooks and updated documentation of update and post-update hooks. [jc: with minor copy-editing] Signed-off-by: Jan Hudec <bulb@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * tiny fix in documentation of git-cloneSteffen Prohaska2007-05-12
| | | | | | | | | | | | | | path in example was missing '../' Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Minor copyediting on Release Notes for 1.5.2Junio C Hamano2007-05-10
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT v1.5.2-rc3v1.5.2-rc3Junio C Hamano2007-05-10
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document 'git-log --decorate'Michael Hendricks2007-05-10
| | | | | | | | | | Signed-off-by: Michael Hendricks <michael@ndrix.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-10
|\ \ | |/ | | | | | | | | | | | | * maint: .mailmap: add some aliases SPECIFYING RANGES typo fix: it it => it is git-clone: don't get fooled by $PWD Fix documentation of tag in git-fast-import.txt
| * SPECIFYING RANGES typo fix: it it => it isJari Aalto2007-05-10
| | | | | | | | | | Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix documentation of tag in git-fast-import.txtRichard P. Curnow2007-05-09
| | | | | | | | | | | | | | The tag command does not take a trailing LF. Signed-off-by: Richard P. Curnow <rc@rc0.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update documentation links to point at 1.5.1.4Junio C Hamano2007-05-08
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Increase pack.depth default to 50Theodore Ts'o2007-05-08
| | | | | | | | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add pack.depth option to git-pack-objects.Theodore Ts'o2007-05-08
| | | | | | | | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-08
|\ \ | |/ | | | | | | | | | | | | * maint: GIT v1.5.1.4 Add howto files to rpm packages. wcwidth redeclaration user-manual: fix clone and fetch typos
| * GIT v1.5.1.4v1.5.1.4Junio C Hamano2007-05-08
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * user-manual: fix clone and fetch typosJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way. Cc: Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix minor documentation errorsMichael Spang2007-05-07
| | | | | | | | | | | | | | | | - git-ls-files.txt: typo in description of --ignored - git-clean.txt: s/forceRequire/requireForce/ Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-07
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * maint: Documentation: don't reference non-existent 'git-cvsapplycommit' user-manual: stop deprecating the manual user-manual: miscellaneous editing user-manual: fix .gitconfig editing examples user-manual: clean up fast-forward and dangling-objects sections user-manual: add section ID's user-manual: more discussion of detached heads, fix typos git-gui: Allow spaces in path to 'wish' gitk: Allow user to choose whether to see the diff, old file, or new file
| * Documentation: don't reference non-existent 'git-cvsapplycommit'Jeff King2007-05-06
| | | | | | | | | | Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * user-manual: stop deprecating the manualJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | It's just as much a work-in-progress, but at least now it's gotten enough technical review to shake out most of the really bad lies, so hopefully it doesn't do any actual damage. And if we encourage people to read it, they'll be more likely to whine about it, which will help get it fixed faster. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| * user-manual: miscellaneous editingJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | I cherry-picked some additional miscellaneous fixes from those suggested by Santi Béjar, including fixes to: - correct discussion of repository/HEAD->repository shortcut - add mention of git-mergetool - add mention of --track - mention "-f" as well as "+" for fetch Cc: Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| * user-manual: fix .gitconfig editing examplesJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | Santi Béjar points out that when telling people how to "introduce themselves" to git we're advising them to replace their entire .gitconfig file. Fix that. Cc: "Santi Béjar <sbejar@gmail.com> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| * user-manual: clean up fast-forward and dangling-objects sectionsJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | The previous commit calls attention to the fact that we have two sections each devoted to fast-forwards and to dangling objects. Revise and attempt to differentiate them a bit. Some more reorganization may be required later.... Signed-off-by: J. Bruce Fields
| * user-manual: add section ID'sJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Any section lacking an id gets an annoying warning when you build the manual. More seriously, the table of contents then generates volatile id's which change with every build, with the effect that we get URL's that change all the time. The ID's are manually generated and sometimes inconsistent, but that's OK. XXX: what to do about the preface? Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
| * user-manual: more discussion of detached heads, fix typosJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | Nicolas Pitre pointed out a couple typos and some room for improvement in the discussion of detached heads. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Cc: Nicolas Pitre <nico@cam.org>
* | Added a reference to git-add in the documentation for git-update-indexMatthieu Moy2007-05-07
| | | | | | | | | | Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document git add -u introduced earlier.Matthieu Moy2007-05-07
| | | | | | | | | | | | | | | | This command was implemented, but not documented in dfdac5d9b877641d3aad8ec49f64c2730a3487e3. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT v1.5.2-rc2v1.5.2-rc2Junio C Hamano2007-05-06
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-06
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * maint: Small correction in reading of commit headers Documentation: fix typo in git-remote.txt Add test for blame corner cases. blame: -C -C -C blame: Notice a wholesale incorporation of an existing file. Fix --boundary output diff format documentation: describe raw combined diff format Mention version 1.5.1 in tutorial and user-manual Add --no-rebase option to git-svn dcommit Fix markup in git-svn man page
| * Documentation: fix typo in git-remote.txtJames Bowes2007-05-05
| | | | | | | | | | Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * diff format documentation: describe raw combined diff formatJakub Narebski2007-05-04
| | | | | | | | | | | | | | | | | | Add description of raw combined diff format to diff-formats.txt, as "diff format for merges" section, before "Generating patches..." section. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Mention version 1.5.1 in tutorial and user-manualCarl Worth2007-05-04
| | | | | | | | | | | | | | | | | | | | | | Most other documentation will frequently be read from an installation of git so will naturally be associated with the installed version. But these two documents in particular are often read from web pages while users are still exploring git. It's important to mention version 1.5.1 since these documents provide example commands that won't work with previous versions of git. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add --no-rebase option to git-svn dcommitKarl Hasselström2007-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | git-svn dcommit exports commits to Subversion, then imports them back to git again, and last but not least rebases or resets HEAD to the last of the new commits. I guess this rebasing is convenient when using just git, but when the commits to be exported are managed by StGIT, it's really annoying. So add an option to disable this behavior. And document it, too! Signed-off-by: Karl Hasselström <kha@treskal.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix markup in git-svn man pageKarl Hasselström2007-05-04
| | | | | | | | | | | | | | | | Some of the existing markup was just plain broken, and some subcommand options weren't indented properly. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-tag(1): -v option is a subcommand; fix code blockJonas Fonseca2007-05-03
| | | | | | | | | | | | | | | | | | When the -v is passed, git-tag will exit after it is processed like it does with the -d and -l options. Additionally, missing code block caused wrong rendering of an option example. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-03
|\ \ | |/ | | | | | | | | | | | | | | | | | | * maint: gitweb: use decode_utf8 directly posix compatibility for t4200 Document 'opendiff' value in config.txt and git-mergetool.txt Allow PERL_PATH="/usr/bin/env perl" Make xstrndup common diff.c: fix "size cache" handling. http-fetch: Disable use of curl multi support for libcurl < 7.16.
| * Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven2007-05-03
| | | | | | | | | | Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT v1.5.2-rc1v1.5.2-rc1Junio C Hamano2007-04-30
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-30
|\ \ | |/ | | | | | | | | | | | | | | | | * maint: GIT v1.5.1.3 send-email documentation: clarify --smtp-server git.7: Mention preformatted html doc location Clarify SubmittingPatches Checklist git-svn: Add 'find-rev' command Fix symlink handling in git-svn, related to PerlIO