aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Change from using email.com to example.com as example domain, as per RFC 2606.David Symonds2007-12-06
| | | | | Signed-off-by: David Symonds <dsymonds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.3.7v1.5.3.7Junio C Hamano2007-12-01
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Replace the word 'update-cache' by 'update-index' everywhereJohannes Schindelin2007-11-30
| | | | | Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Improve description of git-branch -d and -D in man page.Jan Hudec2007-11-28
| | | | | | | | | Some users expect that deleting a remote-tracking branch would prevent fetch from creating it again, so be explcit about that it's not the case. Also be a little more explicit about what fully merged means. Signed-off-by: Jan Hudec <bulb@ucw.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* user-manual: recovering from corruptionJ. Bruce Fields2007-11-25
| | | | | | | | | Some instructions on dealing with corruption of the object database. Most of this text is from an example by Linus, identified by Nicolas Pitre <nico@cam.org> with a little further editing by me. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
* user-manual: clarify language about "modifying" old commitsJ. Bruce Fields2007-11-25
| | | | | | | | It's important to remember that git doesn't really allowing "editing" or "modifying" commits, only replacing them by new commits. Redo some of the language to make this clearer. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* user-manual: failed push to public repositoryJ. Bruce Fields2007-11-25
| | | | | | | More details on the case of a failed push to a public (non-shared) repository. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* user-manual: define "branch" and "working tree" at startJ. Bruce Fields2007-11-25
| | | | | | Some explanation here might help. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.Matthieu Moy2007-11-20
| | | | | | | | | | | The HEAD@{...} syntax was documented in git-rev-parse manpage, which is hard to find by someone looking for the documentation of porcelain. git-reflog is probably the place where one expects to find this. While I'm there, "git revlog show whatever" was also undocumented. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* config: clarify compression defaultsBrian Downing2007-11-20
| | | | | | | | | | | | | * Clarify that core.compression provides a system-wide default to other compression parameters. * Explain that the default for pack.compression, -1, is "a default compromise between speed and compression (currently equivalent to level 6)" according to zlib.h. Signed-off-by: Brian Downing <bdowning@lavos.net> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* config: correct core.loosecompression documentationBrian Downing2007-11-20
| | | | | | | | | | * core.loosecompression stated that the default was "0 (best speed)", when in fact 0 is "no compression", and the default is Z_BEST_SPEED, which is 1. Signed-off-by: Brian Downing <bdowning@lavos.net> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano2007-11-18
|\ | | | | | | | | | | | | | | * 'maint' of git://linux-nfs.org/~bfields/git: Documentation: Fix references to deprecated commands user-manual: mention "..." in "Generating diffs", etc. user-manual: Add section "Why bisecting merge commits can be harder ..." git-remote.txt: fix example url
| * Documentation: Fix references to deprecated commandsJ. Bruce Fields2007-11-18
| | | | | | | | | | | | | | | | ... by changing git-tar-tree reference to git-archive and removing seemingly unrelevant footnote about git-ssh-{fetch,upload}. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * user-manual: mention "..." in "Generating diffs", etc.J. Bruce Fields2007-11-18
| | | | | | | | | | | | | | | | | | We should mention the use of the "..." syntax for git-diff here. The note about the difference between diff and the combined output of git-format-patch then no longer fits so well, so remove it. Add a reference to the git-format-patch[1] manpage. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * user-manual: Add section "Why bisecting merge commits can be harder ..."Steffen Prohaska2007-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a discussion of the challenge of bisecting merge commits to the user manual. The original author is Junio C Hamano <gitster@pobox.com>, who posted the text to the mailing list <http://marc.info/?l=git&m=119403257315527&w=2>. His email was adapted for the manual. The discussion is added to "Rewriting history and maintainig patch series". The text added requires good understanding of merging and rebasing. Therefore it should not be placed too early in the manual. Right after the section on "Problems with rewriting history", the discussion of bisect gives another reason for linearizing as much of the history as possible. The text includes suggestions and fixes by Ralf Wildenhues <Ralf.Wildenhues@gmx.de> and Benoit Sigoure <tsuna@lrde.epita.fr>. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * git-remote.txt: fix example urlJ. Bruce Fields2007-11-17
| | | | | | | | | | | | | | If I'm going to use a real example as a URL, I suppose I should get it right.... Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* | GIT 1.5.3.6v1.5.3.6Junio C Hamano2007-11-18
|/
* Update draft release notes for 1.5.3.6Junio C Hamano2007-11-16
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: Fix man page breakage with DocBook XSL v1.72Jonas Fonseca2007-11-14
| | | | | | | | | | | | | | | From version 1.72 it will replace all dots in roff requests with U+2302 ("house" character), and add escaping in output for all instances of dot that are not in roff requests. This caused the ".ft" hack forcing monospace font in listingblocks to end up as "\&.ft" and being visible in the resulting man page. The fix adds a DOCBOOK_XSL_172 build variable that will disable the hack. To allow this variable to be defined in config.mak it also moves build variable handling below the inclusion of config.mak. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-remote.txt: fix typoSergei Organov2007-11-14
| | | | | Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* core-tutorial.txt: Fix argument mistake in an example.Sergei Organov2007-11-14
| | | | | | | | | | One of examples has wrong output given the arguments provided. Fix arguments to match the output. Fix a minor syntax mistake in another place. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* replace reference to git-rm with git-reset in git-commit docJing Xue2007-11-14
| | | | | | | | | | The message in git-commit suggesting to use 'git rm --cached' to unstage is just plain wrong. It really should mention 'git reset'. Suggested by Jan Hudec. Signed-off-by: Jing Xue <jingxue@digizenstudio.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Grammar fixes for gitattributes documentationWincent Colaiuta2007-11-14
| | | | | | | | | | Tweak the "filter" section of the gitattributes documentation to add some missing articles and improve some word choices without changing the semantics of the section. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-branch: remove mention of non-existent '-b' optionJeff King2007-11-11
| | | | | | | | This looks like a cut and paste error from the git-checkout explanation of --no-track. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Start preparing for 1.5.3.6Junio C Hamano2007-11-09
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* SubmittingPatches: improve the 'Patch:' section of the checklistSergei Organov2007-11-08
| | | | | | | | | There were 2 items "send patch to..." but having different set of addresses to send patch to. Merge them together and move the resulting item to the end of checklist. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add Documentation/CodingGuidelinesJohannes Schindelin2007-11-07
| | | | | | | | | | | | Even if our code is quite a good documentation for our coding style, some people seem to prefer a document describing it. The part about the shell scripts is clearly just copied from one of Junio's helpful mails, and some parts were added from comments by Junio, Andreas Ericsson and Robin Rosenberg. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* RelNotes-1.5.3.5: fix another typoDavid D Kilzer2007-11-07
| | | | | Signed-off-by: David D Kilzer <ddkilzer@kilzer.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'gp/maint-diffdoc' into maintJunio C Hamano2007-11-05
|\ | | | | | | | | * gp/maint-diffdoc: git-diff.txt: add section "output format" describing the diff formats
| * git-diff.txt: add section "output format" describing the diff formatsGerrit Pape2007-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | git-diff.txt includes diff-options.txt which for the -p option refers to a section "generating patches.." which is missing from the git-diff documentation. This patch adapts diff-format.txt to additionally mention the git-diff program, and includes diff-format.txt into git-diff.txt. Tino Keitel noticed this problem. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | RelNotes-1.5.3.5: fix typoDavid D Kilzer2007-11-03
| | | | | | | | | | Signed-off-by: David D Kilzer <ddkilzer@kilzer.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: quote commit messages consistently.Sergei Organov2007-11-02
| | | | | | | | | | | | | | | | | | | | | | Documentation quotes commit messages 14 times with double-quotes, and 7 times with single-quotes. The patch turns everything to double-quotes. A nice side effect is that documentation becomes more Windoze-friendly as AFAIK single quotes won't work there. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Remove escaping of '|' in manpage option sectionsJonas Fonseca2007-11-02
|/ | | | | | | The escaped were ending up verbatim in the generated documentation. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-format-patch.txt: fix explanation of an example.Sergei Organov2007-11-01
| | | | | Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-filter-branch.txt: fix a typo.Sergei Organov2007-11-01
| | | | | | Signed-off-by: Sergei Organov <osv@javad.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-clone.txt: Improve --depth description.Ralf Wildenhues2007-11-01
| | | | | | Avoid abbreviation 'revs', improve the language a bit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.3.5v1.5.3.5Junio C Hamano2007-10-31
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Update GIT 1.5.3.5 Release NotesJunio C Hamano2007-10-30
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* core-tutorial: Use new syntax for git-merge.Sergei Organov2007-10-30
| | | | | | | "git-merge <msg> HEAD <other branches>" is still supported but we shouldn't encourage its use. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-merge: document but discourage the historical syntaxJunio C Hamano2007-10-30
| | | | | | | | | | | | Historically "git merge" took its command line arguments in a rather strange order. Document the historical syntax, and also document clearly that it is not encouraged in new scripts. There is no reason to deprecate the historical syntax, as the current code can sanely tell which syntax the caller is using, and existing scripts by people do use the historical syntax. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in exampleMichael W. Olson2007-10-30
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* RelNotes-1.5.3.5: describe recent fixesJunio C Hamano2007-10-29
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Describe more 1.5.3.5 fixes in release notesShawn O. Pearce2007-10-21
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* gitk.txt: Fix markup.Ralf Wildenhues2007-10-19
| | | | | | | For the manpage, avoid generating an em dash in code. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Further 1.5.3.5 fixes described in release notesShawn O. Pearce2007-10-19
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Yet more 1.5.3.5 fixes mentioned in release notesShawn O. Pearce2007-10-18
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Document additional 1.5.3.5 fixes in release notesShawn O. Pearce2007-10-16
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* fix filter-branch documentationJohannes Schindelin2007-10-16
| | | | | | | | | | | The man page for filter-branch still talked about writing the result to the branch "newbranch". This is hopefully the last place where the old behaviour was described. Noticed by Bill Lear. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Correct typos in release notes for 1.5.3.5Shawn O. Pearce2007-10-16
| | | | | | Noticed by Michele Ballabio. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Whip post 1.5.3.4 maintenance series into shape.Shawn O. Pearce2007-10-15
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>