aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git.txt
Commit message (Collapse)AuthorAge
* War on whitespaceJunio C Hamano2007-06-07
| | | | | | | | | This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.2v1.5.2Junio C Hamano2007-05-20
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git.txt: Update links to older documentation pages.Junio C Hamano2007-05-18
| | | | | | | It's starting to take too much space at the beginning of the main documentation page. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add link to 1.5.1.5 release notes.Junio C Hamano2007-05-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update documentation links to point at 1.5.1.4Junio C Hamano2007-05-08
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint'Junio C Hamano2007-05-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | * maint: Documentation: don't reference non-existent 'git-cvsapplycommit' user-manual: stop deprecating the manual user-manual: miscellaneous editing user-manual: fix .gitconfig editing examples user-manual: clean up fast-forward and dangling-objects sections user-manual: add section ID's user-manual: more discussion of detached heads, fix typos git-gui: Allow spaces in path to 'wish' gitk: Allow user to choose whether to see the diff, old file, or new file
| * user-manual: stop deprecating the manualJ. Bruce Fields2007-05-07
| | | | | | | | | | | | | | | | | | | | It's just as much a work-in-progress, but at least now it's gotten enough technical review to shake out most of the really bad lies, so hopefully it doesn't do any actual damage. And if we encourage people to read it, they'll be more likely to whine about it, which will help get it fixed faster. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
* | Merge branch 'maint'Junio C Hamano2007-04-30
|\ \ | |/ | | | | | | | | | | | | | | | | * maint: GIT v1.5.1.3 send-email documentation: clarify --smtp-server git.7: Mention preformatted html doc location Clarify SubmittingPatches Checklist git-svn: Add 'find-rev' command Fix symlink handling in git-svn, related to PerlIO
| * git.7: Mention preformatted html doc locationJari Aalto2007-04-30
| | | | | | | | | | Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAILJosh Triplett2007-04-29
| | | | | | | | | | | | | | | | Some other programs get the user's email address from $EMAIL, so fall back to that if we don't have a Git-specific email address. Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * maint: http.c: Fix problem with repeated calls of http_init Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation Fix import-tars fix. Update .mailmap with "Michael" Do not barf on too long action description Catch empty pathnames in trees during fsck Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes git-svn: Added 'find-rev' command git shortlog documentation: add long options and fix a typo
| * Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentationJosh Triplett2007-04-29
| | | | | | | | | | Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update documentation links to point at v1.5.1.2Junio C Hamano2007-04-21
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.1v1.5.1Junio C Hamano2007-04-03
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update main git.html page to point at 1.5.0.6 documentationJunio C Hamano2007-03-28
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update main git.html page to point at 1.5.0.5 documentationJunio C Hamano2007-03-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch ↵Junio C Hamano2007-03-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'maint' * 'master-for-junio' of git://repo.or.cz/git/fastimport: fast-import: Fail if a non-existant commit is used for merge fast-import: Avoid infinite loop after reset * maint: Fix diff-options references in git-diff and git-format-patch Add definition of <commit-ish> to the main git man page. Begin SubmittingPatches with a check list fast-import: Fail if a non-existant commit is used for merge fast-import: Avoid infinite loop after reset
| * Add definition of <commit-ish> to the main git man page.Theodore Ts'o2007-03-05
| | | | | | | | | | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Post 1.5.0.3 cleanupJunio C Hamano2007-03-04
| | | | | | | | | | | | | | Update the main git.html page to point at 1.5.0.3 documentation. Update draft 1.5.1 release notes with what we have so far. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: link in 1.5.0.2 material to the top documentation page.Junio C Hamano2007-02-26
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Link 1.5.0.1 documentation from the main page.Junio C Hamano2007-02-20
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add link to v1.5.0 documentation.Junio C Hamano2007-02-13
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add release notes to the distribution.Junio C Hamano2007-02-13
| | | | | | | | This also adds a hook in the Makefile I can use to automatically include pointers to documentation for older releases when updating the pages at http://kernel.org/pub/software/scm/git/docs/. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git main documentation: point at the user's manual.Junio C Hamano2007-01-31
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Rename git-repo-config to git-config.Tom Prince2007-01-28
| | | | | Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git.txt: command re-classificationJunio C Hamano2007-01-19
| | | | | | | | | | | | This adds two new classes (pure-helpers and "Interacting with Others") to the command list in the main manual page. The latter class is primarily about foreign SCM interface and is placed before low-level (plumbing) commands. Also it promotes a handful commands to mainporcelain category while demoting some others. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: move command list in git.txt into separate files.Junio C Hamano2007-01-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* sanitize content of README fileNicolas Pitre2007-01-17
| | | | | | | | | | | | Current README content is way too esoteric for someone looking at GIT for the first time. Instead it should provide a quick summary of what GIT is with a few pointers to other resources. The bulk of the previous README content is moved to Documentation/core-intro.txt. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-tag: the command can be used to also verify a tag.Junio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* use 'init' instead of 'init-db' for shipped docs and toolsNicolas Pitre2007-01-12
| | | | | | | | | While 'init-db' still is and probably will always remain a valid git command for obvious backward compatibility reasons, it would be a good idea to move shipped tools and docs to using 'init' instead. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* "init-db" can really be just "init"Nicolas Pitre2007-01-07
| | | | | | | | Make "init" the equivalent of "init-db". This should make first GIT impression a little more friendly. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Create 'git gc' to perform common maintenance operations.Shawn O. Pearce2006-12-27
| | | | | | | | | | | | | | | | | | | | Junio asked for a 'git gc' utility which users can execute on a regular basis to perform basic repository actions such as: * pack-refs --prune * reflog expire * repack -a -d * prune * rerere gc So here is a command which does exactly that. The parameters fed to reflog's expire subcommand can be chosen by the user by setting configuration options in .git/config (or ~/.gitconfig), as users may want different expiration windows for each repository but shouldn't be bothered to remember what they are all of the time. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-reflog: gc.* configuration and documentation.Junio C Hamano2006-12-27
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-merge-fileJohannes Schindelin2006-12-16
| | | | | | | Most of this is derived from the documentation of RCS merge. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update documentation to remove incorrect GIT_DIFF_OPTS example.Sean2006-11-27
| | | | | | | | | Git no longer calls an external diff program to generate patches. Remove the documentation which suggests that you can pass arbitrary diff options via the GIT_DIFF_OPTS environment variable. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-runstatusRene Scharfe2006-11-18
| | | | | | | I copied most of the text from git-status.txt. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-pickaxe: retire pickaxeJunio C Hamano2006-11-08
| | | | | | | | | Just make it take over blame's place. Documentation and command have all stopped mentioning "git-pickaxe". The built-in synonym is left in the command table, so you can still say "git pickaxe", but it probably is a good idea to retire it as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/pickaxe'Junio C Hamano2006-11-07
|\
| * git-pickaxe: blame rewritten.Junio C Hamano2006-10-19
| | | | | | | | | | | | | | | | | | | | Currently it does what git-blame does, but only faster. More importantly, its internal structure is designed to support content movement (aka cut-and-paste) more easily by allowing more than one paths to be taken from the same commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document git-pack-refs and link it to git(7).Junio C Hamano2006-11-06
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Swap the porcelain and plumbing commands in the git man pageRobin Rosenberg2006-10-29
| | | | | | | | | | | | | | This makes the documentation less confusing to newcomers. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Mention that pull can work locally in the synopsisRobin Rosenberg2006-10-29
| | | | | | | | | | Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: fix git-format-patch mark-up and link it from git.txtJunio C Hamano2006-10-28
| | | | | | | | | | | | | | | | Two asterisks the SYNOPSIS section were mistaken as emphasis, and the latter backtick in "`<key>`s" were not recognized as closing backtick. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Refer to git-rev-parse:Specifying Revisions from git.txtJunio C Hamano2006-10-25
|/ | | | | | | | The brief list given in "Symbolic Identifiers" section of the main documentation is good enough for overview, but help the reader to find a more comrehensive list as needed. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add git-upload-archive to the main git man pageFranck Bui-Huu2006-10-05
| | | | | Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-archive: update documentationFranck Bui-Huu2006-09-25
| | | | | | | | | | This patch documents zip backend options. It also adds git-archive command into the main git manual page. Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove upload-tar and make git-tar-tree a thin wrapper to git-archiveJunio C Hamano2006-09-24
| | | | | | | | | | | The command now issues a big deprecation warning message and runs git-archive command with appropriate arguments. git-tar-tree $tree_ish $base always forces $base to be the leading directory name, so the --prefix parameter passed internally to git-archive is a slash appended to it, i.e. "--prefix=$base/". Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update GIT_TRACE documentation.Christian Couder2006-09-03
| | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git(7): move gitk(1) to the list of porcelain commandsJonas Fonseca2006-08-31
| | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git(7): put the synopsis in a verse style paragraphJonas Fonseca2006-08-25
| | | | | | | ... so it wraps properly in small terminals. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>