aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
...
* | | run-command documentation: fix "memset()" parameterMiklos Vajna2008-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-15
| | | | | | | | | | | | | | | 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-15
| | | | | | | | | | | | | | | 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-14
| | | | | | | | | | | | | | | | | | 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-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-14
| | | | | | | | | | | | | | | | | | | | | ... 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-12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12
| | | | | | | | | | | | | | | | | | | | | | | | 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-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate outputJunio C Hamano2008-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mikael Magnusson <mikachu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint'Junio C Hamano2008-06-11
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * maint: fix typo in tutorial
| * | | fix typo in tutorialFred Maranhão2008-06-11
| | | | | | | | | | | | | | | | | | | | 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-09
| |/ / |/| | | | | | | | | | | | | | | | | | | | 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-09
|\ \ \ | |/ / | | | | | | | | | | | | * maint: git-read-tree: document -v option. Remove exec bit from builtin-fast-export.c
| * | git-read-tree: document -v option.Miklos Vajna2008-06-09
| | | | | | | | | | | | | | | 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-08
| | | | | | | | | | | | | | | 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-08
| | | | | | | | | | | | | | | 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-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-08
| | | | | | | | | | | | | | | | | | | | | 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-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge 1.5.5.4 inJunio C Hamano2008-06-07
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | GIT 1.5.5.4v1.5.5.4Junio C Hamano2008-06-07
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | documentation: move git(7) to git(1)Christian Couder2008-06-06
| | | | | | | | | | | | | | | | | | | | | | | | 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-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06
|\ \ \ | |/ / | | | | | | | | | | | | * 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-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-04
| | | | | | | | | | | | | | | | | | | | | 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-04
| | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | GIT v1.5.6-rc1v1.5.6-rc1Junio C Hamano2008-06-03
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation/git-filter-branch.txt: Fix description of --commit-filterKevin Ballard2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old description was misleading and logically impossible. It claimed that the ancestors of the original commit would be re-written to have the multiple emitted ids as parents. Not only would this modify existing objects, but it would create a cycle. What this actually does is pass the multiple emitted ids to the newly-created children to use as parents. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'lr/init-bare'Junio C Hamano2008-06-01
|\ \ \ | | | | | | | | | | | | | | | | * lr/init-bare: git-init: accept --bare option
| * | | git-init: accept --bare optionLuciano Rocha2008-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is unfortunate that "git init --bare" does not work and the only reason why "init" did not learn its own "--bare" option is because "git --bare init" already does the job (and as an option to the git 'potty', it is more generic solution). This teaches "git init" its own "--bare" option, so that both "git --bare init" and "git init --bare" works mostly the same way. [jc: rewrote the log message and added test] Signed-off-by: Luciano Rocha <strange@nsk.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | glossary: improve a few linksLea Wiemann2008-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They now point to more specific/appropriate targets. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Documentation: convert "glossary" and "core-tutorial" to man pagesChristian Couder2008-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch renames the following documents and at the same time converts them to the man format: core-tutorial.txt -> gitcore-tutorial.txt glossary.txt -> gitglossary.txt But as the glossary is included in the user manual and as the new gitglossary man page cannot be included as a whole in the user manual, the actual glossary content is now in its own "glossary-content.txt" new file. And this file is included by both the user manual and the gitglossary man page. Other documents that reference the above ones are changed accordingly and sometimes improved a little too. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Add a --dry-run option to git-svn rebaseSeth Falcon2008-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When working with multiple branches in an svn repository, it can be useful to verify the svn repository and local tracking branch that will be used for the rebase operation. Signed-off-by: Seth Falcon <seth@userprimary.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Clarify description of <repository> argument to pull/fetch for naming remotes.John J. Franey2008-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alter the description of <repository> in OPTIONS section to explicitly state that a 'remote name' is accepted. Rewrite REMOTES section to more directly identify the different kinds of remote-name permitted. Signed-off-by: John J. Franey <jjfraney@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Revision walking documentation: document most important functionsMiklos Vajna2008-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately the list is not complete, but includes the essential ones. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Clearify the documentation for core.ignoreStatMarius Storm-Olsen2008-05-31
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The previous documentation didn't make it clear that the "assume unchanged" was on per file basis, and not a global flag. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: git-cherry uses git-patch-idJunio C Hamano2008-05-28
| | | | | | | | | | | | | | | | | | | | | Geoffrey Irving noticed that git-cherry talks about comparing commits without hinting how they are compared. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Manual subsection to refer to other pages is SEE ALSOJunio C Hamano2008-05-28
| | | | | | | | | | | | | | | | | | Consistently say so in all caps as it is customary to do so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge 1.5.5.3 inJunio C Hamano2008-05-27
|\ \ \ | |/ /
| * | GIT 1.5.5.3v1.5.5.3Junio C Hamano2008-05-27
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>