aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* GIT 1.5.6.4v1.5.6.4Junio C Hamano2008-07-19
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* api-run-command.txt: typofixStephan Beyer2008-07-17
| | | | | | | Replace "run_command_v_opt_dir" by "run_command_v_opt_cd". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Start preparing 1.5.6.4 release notesJunio C Hamano2008-07-16
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'js/maint-pretty-mailmap' into maintJunio C Hamano2008-07-16
|\ | | | | | | | | * js/maint-pretty-mailmap: Add pretty format %aN which gives the author name, respecting .mailmap
| * Add pretty format %aN which gives the author name, respecting .mailmapJohannes Schindelin2008-07-11
| | | | | | | | | | | | | | | | | | | | | | The pretty format %an does not respect .mailmap, but gives the exact author name recorded in the commit. Sometimes it is more desirable, however, to look if the email has another name mapped to it in .mailmap. This commit adds %aN (and %cN for the committer name) to do exactly that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-cherry-pick.txt et al.: Fix misleading -n descriptionPetr Baudis2008-07-16
| | | | | | | | | | | | | | | | | | | | | | The manual page of git-cherry-pick and git-revert asserts that -n works primarily on the working tree, while in fact the primary object it operates on is the index, and the changes only "accidentally" propagate to the working tree. This e.g. leads innocent #git IRC folks to believe that you can use -n to prepare changes for git-add -i staging. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.6.3v1.5.6.3Junio C Hamano2008-07-13
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-mailinfo: document the -n optionLukas Sandström2008-07-11
|/ | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Start preparing release notes for 1.5.6.3Junio C Hamano2008-07-08
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'qq/maint' (early part) into maintJunio C Hamano2008-07-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'qq/maint' (early part): git-svn.perl: workaround assertions in svn library 1.5.0 mailinfo: feed the correct line length to decode_transfer_encoding() git-clone: remove leftover debugging fprintf(). Fix "config_error_nonbool" used with value instead of key clone -q: honor "quiet" option over native transports. attribute documentation: keep EXAMPLE at end builtin-commit.c: Use 'git_config_string' to get 'commit.template' http.c: Use 'git_config_string' to clean up SSL config. diff.c: Use 'git_config_string' to get 'diff.external' convert.c: Use 'git_config_string' to get 'smudge' and 'clean' builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix' Documentation cvs: Clarify when a bare repository is needed Documentation: be precise about which date --pretty uses
| * attribute documentation: keep EXAMPLE at endJunio C Hamano2008-07-05
| | | | | | | | | | | | | | | | | | The document gives overall definition of states in DESCRIPTION, describes various aspects of git operations that can be influenced in EFFECTS, and finally gives examples in the EXAMPLE section. Archive creation however was somehow documented after the EXAMPLE section, not insode EFFECTS. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Documentation cvs: Clarify when a bare repository is neededMatthew Ogilvie2008-07-05
| | | | | | | | | | | | | | | | | | | | New users sometimes import a project and then immediately try to use the imported repository as a central shared repository. This provides pointers about setting up a bare repository for that in the parts of the documentation dealing with CVS migration. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Documentation: be precise about which date --pretty usesNikolaus Schulz2008-07-05
| | | | | | | | | | | | | | This makes it explicit that the --pretty formats 'medium' and 'email' use the author date (and ignore the committer date). Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix grammar in git-rev-parse(1).Mikael Magnusson2008-07-06
|/ | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.6.2v1.5.6.2Junio C Hamano2008-07-04
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Start draft release notes for 1.5.6.2Junio C Hamano2008-07-01
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* doc/rev-parse: clarify reflog vs --until for specifying revisionsJeff King2008-06-29
| | | | | | | | | | | 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-28
| | | | | | | | | | 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-26
|\ | | | | | | | | | | | | | | | | | | | | | | * 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-26
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano2008-06-26
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-26
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.5.6.1v1.5.6.1Junio C Hamano2008-06-25
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | fix update-hook-example to work with packed tag referencesDmitry Potapov2008-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | | | | | | | 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-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-18
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | path-list documentation: document all functions and data structuresMiklos Vajna2008-06-16
| | | | | | | | | | | | | | | 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-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>