summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin2008-01-261-1/+5
| | | | | | | | | When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: add a bit about sendemail.to configurationMike Hommey2008-01-261-0/+2
| | | | | | | | While there is information about this in the configuration section, it was missing in the options section. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git pull manpage: don't include -n from fetch-options.txtMiklos Vajna2008-01-252-4/+9
| | | | | | | | | | | | The -n option stands for --no-summary in git pull [jes: reworded the description to avoid mentioning 'git-fetch'; also exclude '-n' conditional on git-pull -- ugly because of the missing "else" statement in asciidoc] Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-svn(1): update instructions for resuming a git-svn cloneSam Vilain2008-01-251-4/+7
| | | | | | | | | git-svn expects its references under refs/remotes/*; but these will not be copied or set by "git clone"; put in this man page the manual fiddling that is required with current git-svn to get this to work. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-clone -s: document problems with git gc --pruneMiklos Vajna2008-01-231-0/+8
| | | | | | | | There is a scenario when using git clone -s and git gc --prune togother is dangerous. Document this. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Clarify that http-push being temporarily disabled with older cURLJunio C Hamano2008-01-222-2/+15
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* submodule: Document the details of the command line syntaxSteffen Prohaska2008-01-211-2/+3
| | | | | | | | | | Only "status" accepts "--cached" and the preferred way of passing sub-command specific options is after the sub-command. The documentation is adapted to reflect this. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4-rc4v1.5.4-rc4Junio C Hamano2008-01-201-1/+6
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* doc typo: s/prior committing/prior to committing/Jim Meyering2008-01-192-2/+2
| | | | | Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Include rev-list options in git-log manpage.Miklos Vajna2008-01-183-376/+365
| | | | | | | | | | | | Replace the "This manual page describes only the most frequently used options." text with the list of rev-list options in git-log manpage. (The git-diff-tree options are already included.) Move these options to a separate file and include it from both git-rev-list.txt and git-log.txt. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* core-tutorial typofixThomas Zander2008-01-171-1/+1
| | | | | Signed-off-by: Thomas Zander <zander@kde.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Officially deprecate repo-config.Junio C Hamano2008-01-171-0/+4
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* close_lock_file(): new function in the lockfile APIBrandon Casey2008-01-161-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | The lockfile API is a handy way to obtain a file that is cleaned up if you die(). But sometimes you would need this sequence to work: 1. hold_lock_file_for_update() to get a file descriptor for writing; 2. write the contents out, without being able to decide if the results should be committed or rolled back; 3. do something else that makes the decision --- and this "something else" needs the lockfile not to have an open file descriptor for writing (e.g. Windows do not want a open file to be renamed); 4. call commit_lock_file() or rollback_lock_file() as appropriately. This adds close_lock_file() you can call between step 2 and 3 in the above sequence. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Document lockfile APIJunio C Hamano2008-01-161-7/+60
| | | | | | | We have nice set of placeholders, but nobody stepped in to fill the gap in the API documentation, so I am doing it myself. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: fix and clarify grammar in git-merge docs.Dave Peticolas2008-01-161-6/+6
| | | | | Signed-off-by: Dave Peticolas <dave@krondo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add using merge subtree How-ToMiklos Vajna2008-01-142-1/+76
| | | | | Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix git-rerere documentationJunio C Hamano2008-01-142-2/+6
| | | | | | rerere.enabled is _not_ on by default. The command is enabled if rr-cache exists even when rerere.enabled is missing, and enabled or disabled by explicitly setting the rerere.enabled variable.
* GIT 1.5.4-rc3v1.5.4-rc3Junio C Hamano2008-01-111-2/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-relink.txt: describe more clearly how hard linking occursBrandon Casey2008-01-111-3/+4
| | | | | Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Document some default values in config.txtMichele Ballabio2008-01-111-6/+9
| | | | | | | | This documents the default values of gc.auto, gc.autopacklimit fetch.unpacklimit, receive.unpacklimit and transfer.unpacklimit. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Change git-gc documentation to reflect gc.packrefs implementation.Florian La Roche2008-01-091-3/+3
| | | | | | | | | | | | | 56752391a8c0c591853b276e4fa0b45c34ced181 (Make "git gc" pack all refs by default) changed the default of gc.packrefs to true, to pack all refs by default in any repository. IOW, the users need to disable it explicitly if they want to by setting the config variable, since 1.5.3. However, we forgot to update the documentation. This fixes it. Signed-off-by: Florian La Roche <laroche@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge in GIT 1.5.3.8Junio C Hamano2008-01-082-1/+27
|\ | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * GIT 1.5.3.8v1.5.3.8Junio C Hamano2008-01-071-0/+25
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: config: add 'help.*' and 'instaweb.*' variables.Christian Couder2008-01-071-0/+33
| | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: typofixRalf Wildenhues2008-01-073-5/+5
| | | | | | | | | | Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes for 1.5.4Junio C Hamano2008-01-061-2/+13
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Document the color.interactive semanticsJeff King2008-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two possible confusions with the color.interactive description: 1. the short name "interactive" implies that it covers all interactive commands; let's explicitly make it so, even though there are no other interactive commands which currently use it 2. Not all parts of "git add --interactive" are controlled by color.interactive (specifically, the diffs require tweaking color.diff). So let's clarify that it applies only to displays and prompts. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: rename gitlink macro to linkgitDan McGee2008-01-06149-603/+603
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: fix "gitlink::foobar[s]"Junio C Hamano2008-01-062-2/+2
| | | | | | | | | | | | They should be spelled with a single colon. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: remove gitman.info with "make clean"Junio C Hamano2008-01-061-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/Makefile - honor $DESTDIR for quick-install targetMark Levedahl2008-01-061-1/+1
| | | | | | | | | | Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-rev-parse --symbolic-full-nameJunio C Hamano2008-01-061-0/+7
| | | | | | | | | | | | | | | | | | The plumbing level can understand that the user meant "refs/heads/master" when the user says "master" or "heads/master", but there is no easy way for the scripts to figure it out without duplicating the dwim_ref() logic. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes for 1.5.4Junio C Hamano2008-01-051-1/+4
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Document git-reset defaults to HEAD if no commit is givenMarco Costalba2008-01-041-2/+2
| | | | | | | | | | | | Signed-off by: Marco Costalba <mcostalba@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix grammar nits in documentation and in code comments.Jim Meyering2008-01-031-1/+1
| | | | | | | | | | Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint' of git://linux-nfs.org/~bfields/gitJunio C Hamano2007-12-312-2/+2
|\ \ | | | | | | | | | | | | | | | * 'maint' of git://linux-nfs.org/~bfields/git: Documentation/user-manual.txt: fix typo Documentation: fix remote.<name>.skipDefaultUpdate description
| * | Documentation/user-manual.txt: fix typoGustaf Hendeby2007-12-311-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * | Documentation: fix remote.<name>.skipDefaultUpdate descriptionJ. Bruce Fields2007-12-311-1/+1
| |/ | | | | | | | | | | Fix the subcommand name. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* | git-sh-setup: document git_editor() and get_author_ident_from_commit()Miklos Vajna2007-12-281-0/+9
| | | | | | | | | | | | | | These 2 functions were missing from the manpage. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-submodule.txt: typofixJunio C Hamano2007-12-271-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.4-rc2v1.5.4-rc2Junio C Hamano2007-12-261-1/+18
| | | | | | | | | | | | | | Although everybody was quiet during the Christmas holiday, it's been a week since -rc1, so here is -rc2. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'ar/commit-cleanup'Junio C Hamano2007-12-261-1/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | * ar/commit-cleanup: Allow selection of different cleanup modes for commit messages builtin-commit: avoid double-negation in the code. builtin-commit: fix amending of the initial commit t7005: do not exit inside test.
| * | Allow selection of different cleanup modes for commit messagesAlex Riesen2007-12-221-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although we traditionally stripped away excess blank lines, trailing whitespaces and lines that begin with "#" from the commit log message, sometimes the message just has to be the way user wants it. For instance, a commit message template can contain lines that begin with "#", the message must be kept as close to its original source as possible if you are converting from a foreign SCM, or maybe the message has a shell script including its comments for future reference. The cleanup modes are default, verbatim, whitespace and strip. The default mode depends on if the message is being edited and will either strip whitespace and comments (if editor active) or just strip the whitespace (for where the message is given explicitely). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Fix documentation of --first-parent in git-log and copy it to git-rev-listJunio C Hamano2007-12-262-2/+16
| | | | | | | | | | | | | | | | | | | | | Credit goes to Avi Kivity for noticing the lack of description in rev-list manual page. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | shortlog manpage documentation: work around asciidoc markup issuesGustaf Hendeby2007-12-231-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We wanted to have a list in which one (and the sole, as it happen to be) item in it is ".mailmap", but do not seem to be able to convince AsciiDoc to format it correctly for manpages. Reformat it into a paragraph that describes the said file to work around the issue. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: describe 'union' low-level merge driverJunio C Hamano2007-12-223-4/+41
|/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | parse-options: Add a gitcli(5) man page.Pierre Habouzit2007-12-222-1/+114
| | | | | | | | | | | | | | This page should hold every information about the git ways to parse command lines, and best practices to be used for scripting. Signed-off-by: Pierre Habouzit <madcoder@debian.org>
* | Documentation: ls-files -v is about "assume unchanged".Junio C Hamano2007-12-211-1/+2
| | | | | | | | | | | | And refer the reader to update-index documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | everyday: replace 'prune' and 'repack' with 'gc'Miklos Vajna2007-12-201-13/+6
| | | | | | | | | | | | | | | | | | In everyday tasks, "repack -a -d -f" won't be used, so there is not much point mentioning "repack". By showing the --prune option to "gc", we can do without mentioning "git prune", too. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | clean up 1.5.4 release notesJeff King2007-12-201-16/+17
| | | | | | | | | | | | | | | | Mostly typo and small grammatical fixes with one or two rewordings for clarity. But note the important fix for status.relativepaths. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status