aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* GIT 1.6.2.5v1.6.2.5Junio C Hamano2009-05-03
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-05-03
|\ | | | | | | | | | | | | | | * maint-1.6.1: GIT 1.6.1.4 Conflicts: GIT-VERSION-GEN
| * GIT 1.6.1.4v1.6.1.4Junio C Hamano2009-05-03
| | | | | | | | | | | | With a handful of fixes backmerged from 1.6.2.X series Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-28
|\ \ | |/ | | | | | | | | | | * maint-1.6.1: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message
| * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-28
| |\ | | | | | | | | | | | | | | | | | | * maint-1.6.0: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message
| | * Documentation: fix a grammatical error in api-builtin.txtAllan Caffee2009-04-27
| | | | | | | | | | | | | | | Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-18
| |\ \ | | |/ | | | | | | | | | | | | * maint-1.6.0: doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
* | | gitcvs-migration: Link to git-cvsimport documentationFrank Lichtenheld2009-04-20
| | | | | | | | | | | | | | | Signed-off-by: Frank Lichtenheld <flichtenheld@astaro.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.6.2.4v1.6.2.4Junio C Hamano2009-04-19
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano2009-04-19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * mm/maint-add-p-quit: Update git-add.txt according to the new possibilities of 'git add -p'. add-interactive: refactor mode hunk handling git add -p: new "quit" command at the prompt.
| * | | Update git-add.txt according to the new possibilities of 'git add -p'.Matthieu Moy2009-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text is merely cut-and-pasted from git-add--interactive.perl. The cut-and-paste also fixes a typo. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | git add -p: new "quit" command at the prompt.Matthieu Moy2009-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's already 'd' to stop staging hunks in a file, but no explicit command to stop the interactive staging (for the current files and the remaining ones). Of course you can do 'd' and then ^C, but it would be more intuitive to allow 'quit' action. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'jc/maint-shared-literally' into maintJunio C Hamano2009-04-19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * jc/maint-shared-literally: Update docs on behaviour of 'core.sharedRepository' and 'git init --shared' t1301-shared-repo: fix forced modes test
| * | | | Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'Johan Herland2009-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This documentation update is needed to reflect the recent changes where "core.sharedRepository = 0mode" was changed to set, not loosen, the repository permissions. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Describe fixes since 1.6.2.3Junio C Hamano2009-04-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | doc/git-daemon: add missing arguments to max-connections optionMarkus Heidelberg2009-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-04-18
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * maint-1.6.0: doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
| * | | | doc/git-daemon: add missing arguments to optionsMarkus Heidelberg2009-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some spellings and typos. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | imap-send: use correct configuration variable in documentationPaul Bolle2009-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's imap.pass (not imap.password). Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | doc/gitattributes: clarify location of config textJeff King2009-04-17
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gitattributes documentation has a section on the "diff" attribute, with subsections for each of the things you might want to configure in your diff config section (external diff, hunk headers, etc). The first such subsection specifically notes that the definition of the diff driver should go into $GIT_DIR/config, but subsequent sections do not. This location is implied if you are reading the documentation sequentially, but it is not uncommon for a new user to jump to (or be referred to) a specific section. For a new user who does not know git well enough to recognize the config syntax, it is not clear that those directives don't also go into the gitattributes file. This patch just mentions the config file in each subsection, similar to the way it is mentioned in the first. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | GIT 1.6.2.3v1.6.2.3Junio C Hamano2009-04-12
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-12
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * maint-1.6.1: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * maint-1.6.0: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls
| | * | State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)2009-04-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano2009-04-08
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications
* | | | | Start 1.6.2.3 preparationJunio C Hamano2009-04-08
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-07
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * maint-1.6.1: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index
| * | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-07
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | * maint-1.6.0: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index
| | * | | Documentation: clarify .gitattributes searchJason Merrill2009-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the term "toplevel of the work tree" in gitattributes.txt and gitignore.txt to define the limits of the search for those files. Signed-off-by: Jason Merrill <jason@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | | git-checkout.txt: clarify that <branch> applies when no path is given.Matthieu Moy2009-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the sentence "Defaults to HEAD." can be mis-read to mean that "git checkout -- hello.c" checks-out from HEAD. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * | | git-checkout.txt: fix incorrect statement about HEAD and indexMatthieu Moy2009-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command "git checkout" checks out from the index by default, not HEAD (the introducing comment were correct, but the detailled explanation added below were not). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | doc/git-pack-refs: fix two grammar issuesMarkus Heidelberg2009-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | GIT 1.6.2.2v1.6.2.2Junio C Hamano2009-04-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintJunio C Hamano2009-04-02
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications
| * | | | Documentation: format-patch --root clarificationsThomas Rast2009-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users were confused about the meaning and use of the --root option. Notably, since 68c2ec7 (format-patch: show patch text for the root commit, 2009-01-10), --root has nothing to do with showing the patch text for the root commit any more. Shorten and clarify the corresponding paragraph in the DESCRIPTION section, document --root under OPTIONS, and add an explicit note that root commits are formatted regardless. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'dm/maint-docco' into maintJunio C Hamano2009-04-02
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dm/maint-docco: Documentation: Remove spurious uses of "you" in git-bisect.txt. Documentation: minor grammatical fix in git-check-ref-format.txt Documentation: minor grammatical fixes in git-check-attr.txt Documentation: minor grammatical fixes in git-cat-file.txt Documentation: minor grammatical fixes and rewording in git-bundle.txt Documentation: remove some uses of the passive voice in git-bisect.txt Documentation: reword example text in git-bisect.txt. Documentation: reworded the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-branch.txt. Documentation: minor grammatical fixes in git-blame.txt. Documentation: reword the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-archive.txt.
| * | | | | Documentation: Remove spurious uses of "you" in git-bisect.txt.David J. Mellor2009-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were added by accident in a42dea3. This patch also rewords the description of how ranges of commits can be skipped. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: minor grammatical fix in git-check-ref-format.txtDavid J. Mellor2009-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: minor grammatical fixes in git-check-attr.txtDavid J. Mellor2009-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: minor grammatical fixes in git-cat-file.txtDavid J. Mellor2009-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: minor grammatical fixes and rewording in git-bundle.txtDavid J. Mellor2009-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also converts all reference specifications to a monospaced font, as the embedded ~ character used in some of the references sometimes causes the text up to the next ~ to be displayed incorrectly as a subscript when the HTML pages are generated. This was tested with asciidoc 8.2.5. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: remove some uses of the passive voice in git-bisect.txtDavid J. Mellor2009-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: reword example text in git-bisect.txt.David J. Mellor2009-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid splitting sentences across examples of command usage. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: reworded the "Description" section of git-bisect.txt.David J. Mellor2009-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fixes missing from 2364259. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: minor grammatical fixes in git-branch.txt.David J. Mellor2009-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: minor grammatical fixes in git-blame.txt.David J. Mellor2009-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: reword the "Description" section of git-bisect.txt.David J. Mellor2009-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword this section to make it less chatty. Also make minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: minor grammatical fixes in git-archive.txt.David J. Mellor2009-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-01
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * maint-1.6.1: Documentation: Remove an odd "instead"
| * | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-01
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * maint-1.6.0: Documentation: Remove an odd "instead"