aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Document git-blame triple -C optionRamkumar Ramachandra2010-01-14
| | | | | | | Lift the explanation of -CCC option in the source to the documentation. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: tiny git config manual tweaksJonathan Nieder2010-01-09
| | | | | | | | | | As a verb, 'setup' is spelled 'set up'. “diff commands such as diff-files” scans better without a comma. Clarify that shallow and deep are special non-boolean values for format.thread rather than boolean values with some other name. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: git gc packs refs by default nowJonathan Nieder2010-01-09
| | | | | | | | | | | | | | | | | In commit 56752391 (Make "git gc" pack all refs by default, 2007-05-24), 'git gc' was changed to run pack-refs by default Versions before v1.5.1.2 cannot clone repos with packed refs over http, and versions before v1.4.4 cannot handled packed refs at all, but more recent git should have no problems. Try to make this more clear in the git-config manual. The analagous passage in git-gc.txt was updated already with commit fe2128a (Change git-gc documentation to reflect gc.packrefs implementation., 2008-01-09). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* fast-import: Document author/committer/tagger name is optionalShawn O. Pearce2009-12-31
| | | | | | | | | | The fast-import parser does not validate that the author, committer or tagger name component contains both a name and an email address. Therefore the name component has always been optional. Correct the documentation to match the implementation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* SubmittingPatches: hints to know the status of a submitted patch.Matthieu Moy2009-12-31
| | | | | | | | "What happened to my patch" is pretty much a FAQ on the Git mailing list, it deserves a few paragraphs in SubmittingPatches... Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: always respect core.worktree if setNguyễn Thái Ngọc Duy2009-12-29
| | | | | | | | | | | The value of core.worktree in a ".git/config" is honored even when it differs from the directory that has the ".git" directory as its subdirectory. This is likely to be a misconfiguration, so warn users about it. Also, drop the part of the documentation that incorrectly claimed that we ignore such a misconfigured value. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Start 1.6.6.X maintenance trackJunio C Hamano2009-12-26
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.6.6v1.6.6Junio C Hamano2009-12-23
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* update release notes for git svn in 1.6.6Eric Wong2009-12-21
| | | | Signed-off-by: Eric Wong <normalperson@yhbt.net>
* Git 1.6.6-rc4v1.6.6-rc4Junio C Hamano2009-12-20
| | | | | | Hopefully the last rc before the final one. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint'Junio C Hamano2009-12-19
|\ | | | | | | | | | | | | * maint: rebase -i: abort cleanly if the editor fails to launch technical-docs: document hash API api-strbuf.txt: fix typos and document launch_editor()
| * technical-docs: document hash APIStephen Boyd2009-12-17
| | | | | | | | | | Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd2009-12-17
| | | | | | | | | | Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.6.6-rc3v1.6.6-rc3Junio C Hamano2009-12-16
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-16
|\ \ | |/ | | | | | | | | | | | | | | * maint: Git 1.6.5.7 worktree: don't segfault with an absolute pathspec without a work tree ignore unknown color configuration help.autocorrect: do not run a command if the command given is junk Illustrate "filter" attribute with an example
| * Git 1.6.5.7v1.6.5.7Junio C Hamano2009-12-16
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-14
| | | | | | | | | | | | | | | | The example was taken from aa4ed402c9721170fde2e9e43c3825562070e65e (Add 'filter' attribute and external filter driver definition). Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update Release Notes for 1.6.6 to remove old bugfixesJunio C Hamano2009-12-10
| | | | | | | | | | | | These three have already been backported to 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.6.5.6Junio C Hamano2009-12-10
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.6.5.6v1.6.5.6Junio C Hamano2009-12-10
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Remove post-upload-hookJunio C Hamano2009-12-10
| | | | | | | | | | | | | | This hook runs after "git fetch" in the repository the objects are fetched from as the user who fetched, and has security implications. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.6.6-rc2v1.6.6-rc2Junio C Hamano2009-12-09
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes to 1.6.6 before -rc2Junio C Hamano2009-12-09
| | | | | | | | | | | | | | Reword the 1.7.0 warnings, and drop deprecation of "merge <msg> HEAD <commit>..." syntax. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.6.5.5Junio C Hamano2009-12-05
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.6.5.5v1.6.5.5Junio C Hamano2009-12-05
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Documentation: Avoid use of xmlto --stringparamTodd Zullinger2009-12-05
| | | | | | | | | | | | | | | | | | | | The --stringparam option is not available on older xmlto versions. Instead, set man.base.url.for.relative.links via a .xsl file. Older docbook versions will ignore this without causing grief to users of older xmlto versions. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * archive: clarify description of path parameterRené Scharfe2009-12-04
| | | | | | | | | | | | | | | | | | | | Mention that path parameters are based on the current working directory. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> -- Documentation/git-archive.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint'Junio C Hamano2009-12-03
|\ \ | |/ | | | | | | | | | | * maint: Prepare for 1.6.5.5 Documentation: xmlto 0.0.18 does not know --stringparam t4201: use ISO8859-1 rather than ISO-8859-1
| * Prepare for 1.6.5.5Junio C Hamano2009-12-03
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano2009-12-03
| |\ | | | | | | | | | | | | | | | * mm/maint-hint-failed-merge: user-manual: Document that "git merge" doesn't like uncommited changes. merge-recursive: point the user to commit when file would be overwritten.
| * \ Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano2009-12-03
| |\ \ | | | | | | | | | | | | | | | | * mo/maint-crlf-doc: core.autocrlf documentation: mention the crlf attribute
| * \ \ Merge branch 'th/remote-usage' into maintJunio C Hamano2009-12-03
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * th/remote-usage: git remote: Separate usage strings for subcommands
| * \ \ \ Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-03
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mm/config-pathname-tilde-expand: Documentation: avoid xmlto input error expand_user_path: expand ~ to $HOME, not to the actual homedir. Expand ~ and ~user in core.excludesfile, commit.template
| * \ \ \ \ Merge branch 'rg/doc-workflow' into maintJunio C Hamano2009-12-03
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rg/doc-workflow: Add branch management for releases to gitworkflows
| * | | | | | Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano2009-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer DocBook stylesheets want man.base.url.for.relative.links parameter set when formatting manpages with external references to turn them into full URLs, and leave a helpful "you should set this parameter" message in the output. Earlier we added the MAN_BASE_URL make variable to specify the value for it. When MAN_BASE_URL is not given, it ought to be safe to set the parameter to empty; it would result in an empty leading path for older stylesheets that ignore the parameter, and newer ones would produce the same "relative URL" without the message. Unfortunately, older xmlto (at least version 0.0.18 released in early 2004 that comes with RHEL/CentOS 5) does not understand the --stringparam command line option, so we cannot add the parameter definition unconditionally to the command line. Work it around by passing the parameter only when set. If you do not have a suitable URL prefix, you can pass a quoted empty string to it, like so: $ make MAN_BASE_URL='""' Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | Merge in 1.6.5.4Junio C Hamano2009-12-03
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | Git 1.6.5.4v1.6.5.4Junio C Hamano2009-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | Unconditionally set man.base.url.for.relative.linksJunio C Hamano2009-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even setting it to empty is better than leaving it unset as it prevents the warning cruft from appearing in the output. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | Merge branch 'maint'Junio C Hamano2009-12-03
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeJunio C Hamano2009-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junio@kernel.org>
* | | | | | | Git 1.6.6-rc1v1.6.6-rc1Junio C Hamano2009-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | Merge branch 'maint'Junio C Hamano2009-12-02
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Prepare for 1.6.5.4 merge: do not add standard message when message is given with -m option Do not misidentify "git merge foo HEAD" as an old-style invocation Conflicts: RelNotes
| * | | | | | Prepare for 1.6.5.4Junio C Hamano2009-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | Update draft release notes to 1.6.6 before -rc1Junio C Hamano2009-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | Merge branch 'maint'Junio C Hamano2009-12-01
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: help: Do not unnecessarily look for a repository Documentation: Fix a few i.e./e.g. mix-ups Documentation: Document --branch option in git clone synopsis
| * | | | | | Documentation: Fix a few i.e./e.g. mix-upsMichael J Gruber2009-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A git bundle can be transported by several means (such as e-mail), not only by snekaernet, so use e.g. instead of i.e. The mix-up in git-bundle.txt is obvious. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | Documentation: Document --branch option in git clone synopsisDavid Soria Parra2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the --branch option as [-b <name>] in git clones synopsis. Signed-off-by: David Soria Parra <dsp@php.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | Merge branch 'jc/pretty-lf'Junio C Hamano2009-11-30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pretty.c t/t6006-rev-list-format.sh
| * | | | | | | Pretty-format: %[+-]x to tweak inter-item newlinesJunio C Hamano2009-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This teaches the "pretty" machinery to expand '%+x' to a LF followed by the expansion of '%x' if and only if '%x' expands to a non-empty string, and to remove LFs before '%-x' if '%x' expands to an empty string. This works for any supported expansion placeholder 'x'. This is expected to be immediately useful to reproduce the commit log message with "%s%+b%n"; "%s%n%b%n" adds one extra LF if the log message is a one-liner. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | Merge branch 'cc/bisect-doc'Junio C Hamano2009-11-30
|\ \ \ \ \ \ \ \