summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Start draft release notes for 1.5.6.2Junio C Hamano2008-07-011-0/+31
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* doc/rev-parse: clarify reflog vs --until for specifying revisionsJeff King2008-06-291-1/+4
| | | | | | | | | | | The rev-parse manpage introduces the branch@{date} syntax, and mentions the reflog specifically. However, new users may not be familiar with the distinction between the reflog and the commit date, so let's help them out with a "you may be interested in --until" pointer. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* fix git config example syntaxJoey Hess2008-06-281-1/+1
| | | | | | | | | | git-config expects a space, not '=' between option and value. Also, quote the value since it contains globs, which some shells will not pass through unchanged, or will abort if the glob doesn't expand. Signed-off-by: Joey Hess <joey@kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint-1.5.5' into maintJunio C Hamano2008-06-262-0/+54
|\ | | | | | | | | | | | | | | | | | | | | | | * maint-1.5.5: GIT 1.5.5.5 GIT 1.5.4.6 git-shell: accept "git foo" form Conflicts: GIT-VERSION-GEN RelNotes
| * GIT 1.5.5.5v1.5.5.5Junio C Hamano2008-06-261-0/+11
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano2008-06-261-0/+43
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-1.5.4: GIT 1.5.4.6 git-shell: accept "git foo" form Conflicts: GIT-VERSION-GEN RelNotes
| | * GIT 1.5.4.6v1.5.4.6Junio C Hamano2008-06-261-0/+43
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.5.6.1v1.5.6.1Junio C Hamano2008-06-252-5/+34
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | fix update-hook-example to work with packed tag referencesDmitry Potapov2008-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The update-hook-example used 'test -f' to check the tag present, which does not work if the checked reference is packed. This check has been changed to use 'git rev-parse $tag' instead. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | api-parse-options.txt: Introduce documentation for parse options APIStephan Beyer2008-06-221-2/+202
| | | | | | | | | | | | | | | | | | | | | | | | Add some documentation of basics, macros and callback implementation of the parse-options API. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | api-builtin.txt: update and fix typoStephan Beyer2008-06-221-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Mention NEED_WORK_TREE flag and command-list.txt. Fix "bulit-in" typo and AsciiDoc-formatting of a paragraph. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: fix formatting in git-svnJan Krüger2008-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a misplaced list block separator, general hints about the config file options got indented at the same level as the description of the last option, making it easy to miss them. Signed-off-by: Jan Krüger <jk@jk.gs> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.5.6v1.5.6Junio C Hamano2008-06-182-6/+8
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | path-list documentation: document all functions and data structuresMiklos Vajna2008-06-161-4/+121
| | | | | | | | | | | | | | | Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | run-command documentation: fix "memset()" parameterMiklos Vajna2008-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | When initializing the struct async and struct child_process structures, the documentation suggested "clearing" the structure with '0' instead of '\0'. It is enough to use integer zero here. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Consistency: Use "libcurl" instead of "cURL library" and "curl"Johan Herland2008-06-152-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: RelNotes-1.5.6: talk about renamed HTML filesChristian Couder2008-06-151-2/+4
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.5.6-rc3v1.5.6-rc3Junio C Hamano2008-06-141-1/+1
| | | | | | | | | | | | | | | | | | Just a lot of small fixes, mostly documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git add: add long equivalents of '-u' and '-f' optionsSZEDER Gábor2008-06-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option -u stands for --update and it is a good idea to make it clear especially because this is the only mode of operation of "git add" that does something different from "adding". Give longer --force synonym to -f while we are at it as well. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | documentation: bisect: remove bits talking about a bisection branchChristian Couder2008-06-141-4/+3
| | | | | | | | | | | | | | | | | | | | | ... because we are now bisecting using a detached HEAD. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'om/remote-fix'Junio C Hamano2008-06-121-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * om/remote-fix: "remote prune": be quiet when there is nothing to prune remote show: list tracked remote branches with -n remote prune: print the list of pruned branches builtin-remote: split show_or_prune() in two separate functions remote show: fix the -n option
| * | | remote prune: print the list of pruned branchesOlivier Marin2008-06-101-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command is really too quiet which make it unconfortable to use. Also implement a --dry-run option, in place of the original -n one, to list stale tracking branches that will be pruned, but do not actually prune them. Add a test case for --dry-run. Signed-off-by: Olivier Marin <dkr@freesurf.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | remote show: fix the -n optionOlivier Marin2008-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The perl version accepted a -n flag, to show local informations only without querying remote heads, that seems to have been lost in the C revrite. This restores the older behaviour and add a test case. Signed-off-by: Olivier Marin <dkr@freesurf.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | document --pretty=tformat: optionJeff King2008-06-121-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | This was introduced in 4da45bef, but never documented anywhere. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | user-manual: describe how higher stages are set during a mergeJunio C Hamano2008-06-121-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Higher stages store the blobs involved from their side verbatim. Removal of uninteresting hunks are done by "diff --cc" upon demand and not stored in the index. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | doc: adding gitman.info and *.texi to .gitignoreGeoffrey Irving2008-06-121-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate outputJunio C Hamano2008-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already had a hack to exclude @pxref{[URLS]} from the texi stream that refers to nonexistent anchor. This allows "make info" to produce gitman.info again. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Documentation/git-pull.txt: Use more standard [NOTE] markupJunio C Hamano2008-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other manual pages (e.g. git-blame.txt), this used *NOTE:* to show a side note headed with boldface string "NOTE". Use a paragraph headed by [NOTE] like others instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Typo in RelNotes.Mikael Magnusson2008-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mikael Magnusson <mikachu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint'Junio C Hamano2008-06-111-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * maint: fix typo in tutorial
| * | | fix typo in tutorialFred Maranhão2008-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Documentation/git-cat-file.txt: add missing line breakLea Wiemann2008-06-091-0/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | Without [verse], the line break between the two synopsis lines does not make it into the man page. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint'Junio C Hamano2008-06-091-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | * maint: git-read-tree: document -v option. Remove exec bit from builtin-fast-export.c
| * | git-read-tree: document -v option.Miklos Vajna2008-06-091-0/+3
| | | | | | | | | | | | | | | Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-name-rev.txt: document --no-undefined and --alwaysStephan Beyer2008-06-081-0/+7
| | | | | | | | | | | | | | | Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-describe.txt: document --alwaysStephan Beyer2008-06-081-0/+3
| | | | | | | | | | | | | | | Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Docs: add some long/short optionsStephan Beyer2008-06-084-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Namely: git-clean.txt: --dry-run --quiet git-count-objects.txt: --verbose git-quiltimport.txt: -n git-remote.txt: -v --verbose Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer2008-06-0856-210/+394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OPTIONS section of a documentation file contains a list of the options a git command accepts. Currently there are several variants to describe the case that different options (almost) do the same in the OPTIONS section. Some are: -f, --foo:: -f|--foo:: -f | --foo:: But AsciiDoc has the special form: -f:: --foo:: This patch applies this form to the documentation of the whole git suite, and removes useless em-dash prevention, so \--foo becomes --foo. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-commit.txt: Add missing long/short optionsStephan Beyer2008-06-081-8/+9
| | | | | | | | | | | | | | | | | | | | | Also split the "-c or -C <commit>" item into two separate items. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-commit.txt: Correct option alternativesStephan Beyer2008-06-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the SYNOPSIS in git-commit.txt: * --amend could be used in conjunction with -c/-C/-F/-m; it is not mutually exclusive with them. * -m and -F are not alternative options to -c/-C; you can reuse authorship from a commit (-c/-C) but change the message (-m/-F). Furthermore, for long-option consistency --author <author> is changed to --author=<author>. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.5.6-rc2v1.5.6-rc2Junio C Hamano2008-06-071-0/+6
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge 1.5.5.4 inJunio C Hamano2008-06-072-1/+9
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | GIT 1.5.5.4v1.5.5.4Junio C Hamano2008-06-072-1/+9
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | documentation: move git(7) to git(1)Christian Couder2008-06-06140-146/+144
| | | | | | | | | | | | | | | | | | | | | | | | As the "git" man page describes the "git" command at the end-user level, it seems better to move it to man section 1. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | documentation: convert "diffcore" and "repository-layout" to man pagesChristian Couder2008-06-068-20/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch renames the following documents and at the same time converts them to the man format: diffcore.txt -> gitdiffcore.txt (man section 7) repository-layout.txt -> gitrepository-layout.txt (man section 5) Other documents that reference the above ones are changed accordingly. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint'Junio C Hamano2008-06-061-8/+9
|\ \ \ | |/ / | | | | | | | | | | | | * maint: git-for-each-ref.txt: minor improvements name-rev: Fix segmentation fault when using --all
| * | git-for-each-ref.txt: minor improvementsLea Wiemann2008-06-061-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrapped synopsis and removed wrong asterisk behind --count option; clarified --sort=<key> description for multiple keys; documented that for-each-ref supports not only glob patterns but also prefixes like "refs/heads" as patterns, and that multiple patterns can be given. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Strbuf documentation: document most functionsMiklos Vajna2008-06-041-2/+237
| | | | | | | | | | | | | | | | | | | | | All functions in strbuf.h are documented, except launch_editor(). Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation/git-mailsplit: Enhanced description of -o optionDirk Suesserott2008-06-041-1/+1
| | | | | | | | | | | | | | | | | | Added '-o' in the description of '-o<directory>' for consistency reasons. Signed-off-by: Dirk Suesserott <newsletter@dirk.my1.cc>
* | | Documentation: git-log cannot use rev-list specific optionsJunio C Hamano2008-06-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The log family and git-rev-list share the same set of options that come from revision walking machinery, but they both have options unique to them. Notably, --header, --timestamp, --stdin and --quiet apply only to rev-list. Exclude them from the git-log documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status