diff options
Diffstat (limited to 'Documentation')
78 files changed, 305 insertions, 162 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index bb21d6af44..3cfa360a9e 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -17,14 +17,14 @@ DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES)) DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT)) DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) -prefix=$(HOME) +prefix?=$(HOME) bin=$(prefix)/bin mandir=$(prefix)/man man1=$(mandir)/man1 man7=$(mandir)/man7 # DESTDIR= -INSTALL=install +INSTALL?=install # # Please note that there is a minor bug in asciidoc. diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt index 4361278dab..57436f0078 100644 --- a/Documentation/cvs-migration.txt +++ b/Documentation/cvs-migration.txt @@ -1,6 +1,5 @@ -Git for CVS users +git for CVS users ================= -v0.99.5, Aug 2005 Ok, so you're a CVS user. That's ok, it's a treatable condition, and the first step to recovery is admitting you have a problem. The fact that @@ -8,7 +7,7 @@ you are reading this file means that you may be well on that path already. The thing about CVS is that it absolutely sucks as a source control -manager, and you'll thus be happy with almost anything else. Git, +manager, and you'll thus be happy with almost anything else. git, however, may be a bit 'too' different (read: "good") for your taste, and does a lot of things differently. @@ -16,7 +15,7 @@ One particular suckage of CVS is very hard to work around: CVS is basically a tool for tracking 'file' history, while git is a tool for tracking 'project' history. This sometimes causes problems if you are used to doing very strange things in CVS, in particular if you're doing -things like making branches of just a subset of the project. Git can't +things like making branches of just a subset of the project. git can't track that, since git never tracks things on the level of an individual file, only on the whole project level. @@ -33,7 +32,7 @@ and notes on converting from CVS to git. Second: CVS has the notion of a "repository" as opposed to the thing that you're actually working in (your working directory, or your -"checked out tree"). Git does not have that notion at all, and all git +"checked out tree"). git does not have that notion at all, and all git working directories 'are' the repositories. However, you can easily emulate the CVS model by having one special "global repository", which people can synchronize with. See details later, but in the meantime @@ -50,7 +49,7 @@ gone through the git tutorial, and generally familiarized yourself with how to commit stuff etc in git) is to create a git'ified version of your CVS archive. -Happily, that's very easy indeed. Git will do it for you, although git +Happily, that's very easy indeed. git will do it for you, although git will need the help of a program called "cvsps": http://www.cobite.com/cvsps/ @@ -136,7 +135,7 @@ technically possible, and there are at least two specialized scripts out there that can be used to get equivalent information (see the git mailing list archives for details). -Git has a couple of alternatives, though, that you may find sufficient +git has a couple of alternatives, though, that you may find sufficient or even superior depending on your use. One is called "git-whatchanged" (for obvious reasons) and the other one is called "pickaxe" ("a tool for the software archeologist"). @@ -209,7 +208,7 @@ show anything for commits that do not touch this "if" statement. Also, in the original context, the same statement might have appeared at first in a different file and later the file was renamed to "a-file.c". CVS annotate would not help you to go -back across such a rename, but GIT would still help you in such +back across such a rename, but git would still help you in such a situation. For that, you can give the -C flag to git-diff-tree, like this: diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index dacd8fb534..bfe634dcd3 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -106,7 +106,7 @@ For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, <path>. -Git specific extension to diff format +git specific extension to diff format ------------------------------------- What -p option produces is slightly different from the diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index 9d20a4ff19..7c2168a992 100644 --- a/Documentation/diffcore.txt +++ b/Documentation/diffcore.txt @@ -250,7 +250,7 @@ pattern. Filepairs that match a glob pattern on an earlier line in the file are output before ones that match a later line, and filepairs that do not match any glob pattern are output last. -As an example, typical orderfile for the core GIT probably +As an example, typical orderfile for the core git probably would look like this: ------------------------------------------------ diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 8cbbb4b853..61d9dacc6f 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -1,15 +1,14 @@ git-apply(1) ============ -v0.1, June 2005 NAME ---- -git-apply - Apply patch on a GIT index file and a work tree +git-apply - Apply patch on a git index file and a work tree SYNOPSIS -------- -'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...] +'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...] DESCRIPTION ----------- @@ -22,11 +21,6 @@ OPTIONS The files to read patch from. '-' can be used to read from the standard input. ---no-merge:: - The default mode of operation is the merge behaviour - which is not implemented yet. This flag explicitly - tells the program not to use the merge behaviour. - --stat:: Instead of applying the patch, output diffstat for the input. Turns off "apply". diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index bb543788c0..8f01ca6a16 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -8,7 +8,7 @@ git-applymbox - Apply a series of patches in a mailbox SYNOPSIS -------- -'git-applymbox' [-u] [-k] [-q] ( -c .dotest/<num> | <mbox> ) [ <signoff> ] +'git-applymbox' [-u] [-k] [-q] [-m] ( -c .dotest/<num> | <mbox> ) [ <signoff> ] DESCRIPTION ----------- @@ -33,6 +33,14 @@ OPTIONS munging, and is most useful when used to read back 'git format-patch --mbox' output. +-m:: + Patches are applied with `git-apply` command, and unless + it cleanly applies without fuzz, the processing fails. + With this flag, if a tree that the patch applies cleanly + is found in a repository, the patch is applied to the + tree and then a 3-way merge between the resulting tree + and the current tree. + -u:: By default, the commit log message, author name and author email are taken from the e-mail without any diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index b6793cf55e..fcda0125af 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -3,7 +3,7 @@ git-archimport(1) NAME ---- -git-archimport - Import an Arch repository into GIT +git-archimport - Import an Arch repository into git SYNOPSIS @@ -40,14 +40,14 @@ incremental imports. MERGES ------ -Patch merge data from Arch is used to mark merges in GIT as well. GIT +Patch merge data from Arch is used to mark merges in git as well. git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result -is that GIT will have a good idea of how far branches have diverged. So the +is that git will have a good idea of how far branches have diverged. So the import process does lose some patch-trading metadata. Fortunately, when you try and merge branches imported from Arch, -GIT will find a good merge base, and it has a good chance of identifying +git will find a good merge base, and it has a good chance of identifying patches that have been traded out-of-sequence between the branches. OPTIONS diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index f21a6e06aa..ab4dcae21c 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -1,6 +1,5 @@ git-cat-file(1) =============== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt index 1ba6fb2d9c..613dfabe71 100644 --- a/Documentation/git-checkout-index.txt +++ b/Documentation/git-checkout-index.txt @@ -1,6 +1,5 @@ git-checkout-index(1) ===================== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 8462e06853..26e0467797 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -1,6 +1,5 @@ git-cherry-pick(1) ================== -v0.99.5 Aug 2005 NAME ---- diff --git a/Documentation/git-clone-pack.txt b/Documentation/git-clone-pack.txt index a7868e53d7..b58165a5fc 100644 --- a/Documentation/git-clone-pack.txt +++ b/Documentation/git-clone-pack.txt @@ -1,6 +1,5 @@ git-clone-pack(1) ================= -v0.1, July 2005 NAME ---- @@ -9,7 +8,7 @@ git-clone-pack - Clones a repository by receiving packed objects. SYNOPSIS -------- -'git-clone-pack' [-q] [--exec=<git-upload-pack>] [<host>:]<directory> [<head>...] +'git-clone-pack' [-q] [--keep] [--exec=<git-upload-pack>] [<host>:]<directory> [<head>...] DESCRIPTION ----------- @@ -24,12 +23,17 @@ OPTIONS Pass '-q' flag to 'git-unpack-objects'; this makes the cloning process less verbose. +--keep:: + Do not invoke 'git-unpack-objects' on received data, but + create a single packfile out of it instead, and store it + in the object database. + --exec=<git-upload-pack>:: Use this to specify the path to 'git-upload-pack' on the remote side, if it is not found on your $PATH. Installations of sshd ignore the user's environment setup scripts for login shells (e.g. .bash_profile) and - your privately installed GIT may not be found on the system + your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in ".bashrc", but this flag is for people who do not want to pay the overhead for non-interactive diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 7d713c7385..dd92cdefc2 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -1,6 +1,5 @@ git-clone(1) ============ -v0.1, July 2005 NAME ---- @@ -9,7 +8,7 @@ git-clone - Clones a repository. SYNOPSIS -------- -'git clone' [-l [-s]] [-q] [-n] [-u <upload-pack>] <repository> <directory> +'git-clone' [-l [-s]] [-q] [-n] [-u <upload-pack>] <repository> <directory> DESCRIPTION ----------- diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 9aba868fa4..d9b0ab0717 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -1,6 +1,5 @@ git-commit-tree(1) ================== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 790a8eb0dd..1edc278c64 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -1,6 +1,5 @@ git-commit(1) ============= -v0.99.4, Aug 2005 NAME ---- @@ -8,7 +7,7 @@ git-commit - Record your changes SYNOPSIS -------- -'git commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] <file>... +'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] <file>... DESCRIPTION ----------- diff --git a/Documentation/git-convert-objects.txt b/Documentation/git-convert-objects.txt index 6ce62dc672..b1220c06e1 100644 --- a/Documentation/git-convert-objects.txt +++ b/Documentation/git-convert-objects.txt @@ -1,10 +1,9 @@ git-convert-objects(1) ====================== -v0.1, May 2005 NAME ---- -git-convert-objects - Converts old-style GIT repository +git-convert-objects - Converts old-style git repository SYNOPSIS @@ -13,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -Converts old-style GIT repository to the latest format +Converts old-style git repository to the latest format Author diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index b5753a46dc..f5248c91cb 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -1,6 +1,5 @@ git-cvsimport(1) ================ -v0.1, July 2005 NAME ---- @@ -11,7 +10,7 @@ SYNOPSIS -------- 'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d <CVSROOT> ] [ -p <options-for-cvsps> ] - [ -C <GIT_repository> ] [ -i ] [ -k ] + [ -C <git_repository> ] [ -i ] [ -k ] [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ] @@ -31,7 +30,7 @@ OPTIONS are supported. -C <target-dir>:: - The GIT repository to import to. If the directory doesn't + The git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory. -i:: diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 065f2aa721..a013a58a7f 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -3,7 +3,7 @@ git-daemon(1) NAME ---- -git-daemon - A really simple server for GIT repositories. +git-daemon - A really simple server for git repositories. SYNOPSIS -------- diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index eb9fb74259..e3873888f2 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -1,6 +1,5 @@ git-diff-files(1) ================= -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index 8b6a953c03..2fc3eed710 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -1,6 +1,5 @@ git-diff-index(1) ================= -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt index 276d7bdc43..28c60fc7e4 100644 --- a/Documentation/git-diff-stages.txt +++ b/Documentation/git-diff-stages.txt @@ -1,6 +1,5 @@ git-diff-stages(1) ================== -v0.1, June 2005 NAME ---- diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 339a92287a..dcfb9e18c7 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -1,6 +1,5 @@ git-diff-tree(1) ================ -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index 1d281820cf..ea6faab059 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentation/git-fetch-pack.txt @@ -1,6 +1,5 @@ git-fetch-pack(1) ================= -v0.1, July 2005 NAME ---- @@ -35,7 +34,7 @@ OPTIONS remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and - your privately installed GIT may not be found on the system + your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in ".bashrc", but this flag is for people who do not want to pay the overhead for non-interactive diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 1fa9f4dbf4..c0b5aac5f2 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -1,6 +1,5 @@ git-fetch(1) ============ -v0.99.5, Aug 2005 NAME ---- diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index a1483ffd0f..f3ef4c1e04 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -8,7 +8,7 @@ git-format-patch - Prepare patches for e-mail submission. SYNOPSIS -------- -'git-format-patch' [-n][-o <dir>][-k][--mbox][--diff-options] <his> [<mine>] +'git-format-patch' [-n][-o <dir>|--stdout][-k][--mbox][--diff-options] <his> [<mine>] DESCRIPTION ----------- @@ -54,6 +54,10 @@ OPTIONS concatenated together and fed to `git-applymbox`. Implies --author and --date. +--stdout:: + This flag generates the mbox formatted output to the + standard output, instead of saving them into a file per + patch and implies --mbox. Author ------ diff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.txt index ba251a5152..5dc9dbdd78 100644 --- a/Documentation/git-fsck-objects.txt +++ b/Documentation/git-fsck-objects.txt @@ -1,6 +1,5 @@ git-fsck-objects(1) =================== -v0.1, May 2005 NAME ---- @@ -42,22 +41,22 @@ index file and all SHA1 references in .git/refs/* as heads. ($GIT_DIR/objects), making sure that it is consistent and complete without referring to objects found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES, - nor packed GIT archives found in $GIT_DIR/objects/pack; + nor packed git archives found in $GIT_DIR/objects/pack; cannot be used with --full. --full:: Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES, - and in packed GIT archives found in $GIT_DIR/objects/pack + and in packed git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools; cannot be used with --standalone. --strict:: Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older - versions of GIT. Existing repositories, including the - Linux kernel, GIT itself, and sparse repository have old + versions of git. Existing repositories, including the + Linux kernel, git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag. @@ -81,7 +80,7 @@ Any corrupt objects you will have to find in backups or other archives the hopes that somebody else has the object you have corrupted). Of course, "valid tree" doesn't mean that it wasn't generated by some -evil person, and the end result might be crap. Git is a revision +evil person, and the end result might be crap. git is a revision tracking system, not a quality assurance system ;) Extracted Diagnostics diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 5f082167c1..0175793483 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -1,6 +1,5 @@ git-grep(1) =========== -v0.99.6, Sep 2005 NAME ---- diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 935cc66b38..9239f11135 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -1,6 +1,5 @@ git-hash-object(1) ================== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt index c034272568..088624f6cc 100644 --- a/Documentation/git-http-fetch.txt +++ b/Documentation/git-http-fetch.txt @@ -1,10 +1,9 @@ git-http-fetch(1) ================= -v0.1, May 2005 NAME ---- -git-http-fetch - Downloads a remote GIT repository via HTTP +git-http-fetch - Downloads a remote git repository via HTTP SYNOPSIS @@ -13,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -Downloads a remote GIT repository via HTTP. +Downloads a remote git repository via HTTP. -c:: Get the commit objects. diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt new file mode 100644 index 0000000000..71ce557276 --- /dev/null +++ b/Documentation/git-index-pack.txt @@ -0,0 +1,44 @@ +git-index-pack(1) +================= + +NAME +---- +git-index-pack - Build pack index file for an existing packed archive + + +SYNOPSIS +-------- +'git-index-pack' [-o <index-file>] <pack-file> + + +DESCRIPTION +----------- +Reads a packed archive (.pack) from the specified file, and +builds a pack index file (.idx) for it. The packed archive +together with the pack index can then be placed in the +objects/pack/ directory of a git repository. + + +OPTIONS +------- +-o <index-file>:: + Write the generated pack index into the specified + file. Without this option the name of pack index + file is constructed from the name of packed archive + file by replacing .pack with .idx (and the program + fails if the name of packed archive does not end + with .pack). + + +Author +------ +Written by Sergey Vlasov <vsu@altlinux.ru> + +Documentation +------------- +Documentation by Sergey Vlasov + +GIT +--- +Part of the gitlink:git[7] suite + diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt index ef2d04a612..ef1826ae67 100644 --- a/Documentation/git-init-db.txt +++ b/Documentation/git-init-db.txt @@ -1,6 +1,5 @@ git-init-db(1) ============== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt index ccf9735924..87abec1c4e 100644 --- a/Documentation/git-local-fetch.txt +++ b/Documentation/git-local-fetch.txt @@ -1,10 +1,9 @@ git-local-fetch(1) ================== -v0.1, May 2005 NAME ---- -git-local-fetch - Duplicates another GIT repository on a local system +git-local-fetch - Duplicates another git repository on a local system SYNOPSIS @@ -13,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -Duplicates another GIT repository on a local system. +Duplicates another git repository on a local system. OPTIONS ------- diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 2a0e5aceab..13a3998302 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -1,6 +1,5 @@ git-log(1) ========== -v0.99.4, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-log - Show commit logs SYNOPSIS -------- -'git log' <option>... +'git-log' <option>... DESCRIPTION ----------- diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 89bd609d65..c0a80d4089 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -1,6 +1,5 @@ git-ls-remote(1) ================ -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt index 0d159fd5cc..cdc5654a99 100644 --- a/Documentation/git-ls-tree.txt +++ b/Documentation/git-ls-tree.txt @@ -1,6 +1,5 @@ git-ls-tree(1) ============== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt index 557d2e9056..03a9477664 100644 --- a/Documentation/git-mailsplit.txt +++ b/Documentation/git-mailsplit.txt @@ -7,7 +7,7 @@ git-mailsplit - Totally braindamaged mbox splitter program. SYNOPSIS -------- -'git-mailsplit' <mbox> <directory> +'git-mailsplit' [-d<prec>] [<mbox>] <directory> DESCRIPTION ----------- @@ -17,14 +17,23 @@ directory so you can process them further from there. OPTIONS ------- <mbox>:: - Mbox file to split. + Mbox file to split. If not given, the mbox is read from + the standard input. <directory>:: Directory in which to place the individual messages. +-d<prec>:: + Instead of the default 4 digits with leading zeros, + different precision can be specified for the generated + filenames. + + Author ------ Written by Linus Torvalds <torvalds@osdl.org> +and Junio C Hamano <junkio@cox.net> + Documentation -------------- diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index e4692163ea..d1d56f194a 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -1,6 +1,5 @@ git-merge-base(1) ================= -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 5caee90adc..d072fdaa4f 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -1,6 +1,5 @@ git-merge-index(1) ================== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 712739777b..86aad37c6a 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -1,6 +1,5 @@ git-merge-one-file(1) ===================== -v0.99.4, Aug 2005 NAME ---- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index dca363dd5e..a007a8b15a 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -1,6 +1,5 @@ git-merge(1) ============ -v0.99.6, Sep 2005 NAME ---- diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt index 44ed4b5408..2860a3d1ba 100644 --- a/Documentation/git-mktag.txt +++ b/Documentation/git-mktag.txt @@ -1,6 +1,5 @@ git-mktag(1) ============ -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-octopus.txt b/Documentation/git-octopus.txt index 881c317ac5..6e32ea347c 100644 --- a/Documentation/git-octopus.txt +++ b/Documentation/git-octopus.txt @@ -1,6 +1,5 @@ git-octopus(1) ============== -v0.99.5, Aug 2005 NAME ---- diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 44aba940d7..caf5d0d1ee 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -1,6 +1,5 @@ git-pack-objects(1) =================== -v0.1, July 2005 NAME ---- @@ -31,7 +30,7 @@ transport by their peers. Placing both in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) -enables GIT to read from such an archive. +enables git to read from such an archive. OPTIONS diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt index c1527f1bcf..915d3f8a06 100644 --- a/Documentation/git-peek-remote.txt +++ b/Documentation/git-peek-remote.txt @@ -1,6 +1,5 @@ git-peek-remote(1) ================== -v0.1, July 2005 NAME ---- @@ -23,7 +22,7 @@ OPTIONS remote side, if it is not found on your $PATH. Some installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and - your privately installed GIT may not be found on the system + your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in ".bashrc", but this flag is for people who do not want to pay the overhead for non-interactive diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt index 5c48a0937a..28a1500d39 100644 --- a/Documentation/git-prune-packed.txt +++ b/Documentation/git-prune-packed.txt @@ -1,6 +1,5 @@ git-prune-packed(1) ===================== -v0.1, August 2005 NAME ---- diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt index d1676cbfc8..3367c9b214 100644 --- a/Documentation/git-prune.txt +++ b/Documentation/git-prune.txt @@ -1,6 +1,5 @@ git-prune(1) ============ -v0.99.5, Aug 2005 NAME ---- diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c35d2eb54c..952779292b 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -1,6 +1,5 @@ git-pull(1) =========== -v0.99.4, Aug 2005 NAME ---- diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 5653baccaf..7db5fb5795 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -1,6 +1,5 @@ git-read-tree(1) ================ -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt index fb4b76b6c2..8afde14373 100644 --- a/Documentation/git-receive-pack.txt +++ b/Documentation/git-receive-pack.txt @@ -1,6 +1,5 @@ git-receive-pack(1) =================== -v0.1, July 2005 NAME ---- diff --git a/Documentation/git-rename.txt b/Documentation/git-rename.txt index 21928dc071..583cb0315e 100644 --- a/Documentation/git-rename.txt +++ b/Documentation/git-rename.txt @@ -1,6 +1,5 @@ git-rename(1) ============= -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index bd830ada27..0c1ae49ed7 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -1,6 +1,5 @@ git-repack(1) ============= -v0.99.5, August 2005 NAME ---- diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt index 7d3eb79033..4e57c2b287 100644 --- a/Documentation/git-resolve.txt +++ b/Documentation/git-resolve.txt @@ -1,6 +1,5 @@ git-resolve(1) ============== -v0.99.5, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-resolve - Merge two commits SYNOPSIS -------- -'git resolve' <current> <merged> <message> +'git-resolve' <current> <merged> <message> DESCRIPTION ----------- diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index f386a3a79b..7dbb7c6607 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -1,6 +1,5 @@ git-rev-list(1) =============== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 99fd90e376..694f3a09d4 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -91,7 +91,7 @@ what is called an 'extended SHA1' syntax. * A symbolic ref name. E.g. 'master' typically means the commit object referenced by $GIT_DIR/refs/heads/master. If you happen to have both heads/master and tags/master, you can - explicitly say 'heads/master' to tell GIT which one you mean. + explicitly say 'heads/master' to tell git which one you mean. * A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}<n>' means the <n>th parent (i.e. diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index b95e33db52..b9bec55e53 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -1,6 +1,5 @@ git-send-email(1) ================= -v0.1, July 2005 NAME ---- diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index 219dfc2ef6..577f06a214 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send-pack.txt @@ -1,6 +1,5 @@ git-send-pack(1) ================ -v0.1, July 2005 NAME ---- diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index a852e9b865..65ca77fbf6 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -1,6 +1,5 @@ git-shortlog(1) =============== -v0.99.4, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-shortlog - Summarize 'git log' output. SYNOPSIS -------- -'git log --pretty=short | git shortlog' +'git-log --pretty=short | git shortlog' DESCRIPTION ----------- diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 5b80d5aa2a..c6c97b21c3 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -1,6 +1,5 @@ git-show-branch(1) ================== -v0.99.5, Aug 2005 NAME ---- @@ -8,7 +7,7 @@ git-show-branch - Show branches and their commits. SYNOPSIS -------- -'git show-branch [--all] [--heads] [--tags] [--more=<n> | --list | --independent | --merge-base] <reference>...' +'git-show-branch [--all] [--heads] [--tags] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] <reference>...' DESCRIPTION ----------- @@ -45,6 +44,15 @@ OPTIONS Among the <reference>s given, display only the ones that cannot be reached from any other <reference>. +--no-name:: + Do not show naming strings for each commit. + +--sha1-name:: + Instead of naming the commits using the path to reach + them from heads (e.g. "master~2" to mean the grandparent + of "master"), name them with the unique prefix of their + object names. + Note that --more, --list, --independent and --merge-base options are mutually exclusive. @@ -89,21 +97,6 @@ whose commit message is "Add 'git show-branch'. "fixes" branch adds one commit 'Introduce "reset type"'. "mhf" branch has many other commits. -When only one head is given, the output format changes slightly -to conserve space. The '+' sign to show which commit is -reachable from which head and the first N lines to show the list -of heads being displayed are both meaningless so they are -omitted. Also the label given to each commit does not repeat -the name of the branch because it is obvious. - ------------------------------------------------- -$ git show-branch --more=4 master -[master] Add 'git show-branch'. -[~1] Add a new extended SHA1 syntax <name>~<num> -[~2] Fix "git-diff A B" -[~3] git-ls-files: generalized pathspecs -[~4] Make "git-ls-files" work in subdirectories ------------------------------------------------- Author ------ diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt index 72720ada22..be09b62beb 100644 --- a/Documentation/git-show-index.txt +++ b/Documentation/git-show-index.txt @@ -1,6 +1,5 @@ git-show-index(1) ================= -v0.1, July 2005 NAME ---- @@ -14,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads given idx file for packed GIT archive created with +Reads given idx file for packed git archive created with git-pack-objects command, and dumps its contents. The information it outputs is subset of what you can get from diff --git a/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt index e3887ace09..b7116b30e0 100644 --- a/Documentation/git-ssh-fetch.txt +++ b/Documentation/git-ssh-fetch.txt @@ -1,6 +1,5 @@ git-ssh-fetch(1) ================ -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt index b625019812..702674e45d 100644 --- a/Documentation/git-ssh-upload.txt +++ b/Documentation/git-ssh-upload.txt @@ -1,6 +1,5 @@ git-ssh-upload(1) ================= -v0.1, Jun 2005 NAME ---- diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 6d49a5aa0d..753fc0866d 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -1,6 +1,5 @@ git-status(1) ============= -v0.99.4, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-status - Show working tree status. SYNOPSIS -------- -'git status' +'git-status' DESCRIPTION ----------- diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt new file mode 100644 index 0000000000..88bdc08eb4 --- /dev/null +++ b/Documentation/git-svnimport.txt @@ -0,0 +1,137 @@ +git-svnimport(1) +================ +v0.1, July 2005 + +NAME +---- +git-svnimport - Import a SVN repository into git + + +SYNOPSIS +-------- +'git-svnimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ] + [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_nr_changes] + [ -b branch_subdir ] [ -t trunk_subdir ] [ -T tag_subdir ] + [ -s start_chg ] [ -m ] [ -M regex ] + <SVN_repository_URL> [ <path> ] + + +DESCRIPTION +----------- +Imports a SVN repository into git. It will either create a new +repository, or incrementally import into an existing one. + +SVN access is done by the SVN:: Perl module. + +git-svnimport assumes that SVN repositories are organized into one +"trunk" directory where the main development happens, "branch/FOO" +directories for branches, and "/tags/FOO" directories for tags. +Other subdirectories are ignored. + +git-svnimport creates a file ".git/svn2git", which is required for +incremental SVN imports. + +OPTIONS +------- +-C <target-dir>:: + The GIT repository to import to. If the directory doesn't + exist, it will be created. Default is the current directory. + +-s <start_rev>:: + Start importing at this SVN change number. The default is 1. ++ +When importing incementally, you might need to edit the .git/svn2git file. + +-i:: + Import-only: don't perform a checkout after importing. This option + ensures the working directory and cache remain untouched and will + not create them if they do not exist. + +-t <trunk_subdir>:: + Name the SVN trunk. Default "trunk". + +-T <tag_subdir>:: + Name the SVN subdirectory for tags. Default "tags". + +-b <branch_subdir>:: + Name the SVN subdirectory for branches. Default "branches". + +-o <branch-for-HEAD>:: + The 'trunk' branch from SVN is imported to the 'origin' branch within + the git repository. Use this option if you want to import into a + different branch. + +-m:: + Attempt to detect merges based on the commit message. This option + will enable default regexes that try to capture the name source + branch name from the commit message. + +-M <regex>:: + Attempt to detect merges based on the commit message with a custom + regex. It can be used with -m to also see the default regexes. + You must escape forward slashes. + +-l <max_num_changes>:: + Limit the number of SVN changesets we pull before quitting. + This option is necessary because the SVN library has serious memory + leaks; the recommended value for nontrivial imports is 100. + + git-svnimport will still exit with a zero exit code. You can check + the size of the file ".git/svn2git" to determine whether to call + the importer again. + +-v:: + Verbosity: let 'svnimport' report what it is doing. + +-d:: + Use direct HTTP requests if possible. The "<path>" argument is used + only for retrieving the SVN logs; the path to the contents is + included in the SVN log. + +-D:: + Use direct HTTP requests if possible. The "<path>" argument is used + for retrieving the logs, as well as for the contents. ++ +There's no safe way to automatically find out which of these options to +use, so you need to try both. Usually, the one that's wrong will die +with a 40x error pretty quickly. + +<SVN_repository_URL>:: + The URL of the SVN module you want to import. For local + repositories, use "file:///absolute/path". ++ +If you're using the "-d" or "-D" option, this is the URL of the SVN +repository itself; it usually ends in "/svn". + +<SVN_repository_URL>:: + The URL of the SVN module you want to import. For local + repositories, use "file:///absolute/path". + +<path> + The path to the module you want to check out. + +-h:: + Print a short usage message and exit. + +OUTPUT +------ +If '-v' is specified, the script reports what it is doing. + +Otherwise, success is indicated the Unix way, i.e. by simply exiting with +a zero exit status. + +Author +------ +Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from +various participants of the git-list <git@vger.kernel.org>. + +Based on a cvs2git script by the same author. + +Documentation +-------------- +Documentation by Matthias Urlichs <smurf@smurf.noris.de>. + +GIT +--- +Part of the gitlink:git[7] suite + diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index e11f51c266..3984812cec 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -8,19 +8,27 @@ git-tag - Create a tag object signed with GPG SYNOPSIS -------- -'git-tag' [-a | -s] [-f] [-m <msg>] <name> [<head>] +'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg>] <name> [<head>] DESCRIPTION ----------- -Adds a "tag" reference in .git/refs/tags/ +Adds a 'tag' reference in .git/refs/tags/ -Unless "-f" is given, the tag must not yet exist in ".git/refs/tags" +Unless `-f` is given, the tag must not yet exist in +`.git/refs/tags/` directory. -If "-s" or "-a" is passed, the user will be prompted for a tag message. -and a tag object is created. Otherwise just the SHA1 object -name of the commit object is written. +If one of `-a`, `-s`, or `-u <key-id>` is passed, the command +creates a 'tag' object, and requires the tag message. Unless +`-m <msg>` is given, an editor is started for the user to type +in the tag message. -A GnuPG signed tag object will be created when "-s" is used. +Otherwise just the SHA1 object name of the commit object is +written (i.e. an lightweight tag). + +A GnuPG signed tag object will be created when `-s` or `-u +<key-id>` is used. When `-u <key-id>` is not used, the +committer identity for the current user is used to find the +GnuPG key for signing. Author diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt index 480a0cf0ba..2139b6ff8c 100644 --- a/Documentation/git-tar-tree.txt +++ b/Documentation/git-tar-tree.txt @@ -1,6 +1,5 @@ git-tar-tree(1) =============== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt index 3903b2d99b..213dc8196b 100644 --- a/Documentation/git-unpack-file.txt +++ b/Documentation/git-unpack-file.txt @@ -1,6 +1,5 @@ git-unpack-file(1) ================== -v0.1, May 2005 NAME ---- diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt index 9b982d996f..b716ba1ad3 100644 --- a/Documentation/git-unpack-objects.txt +++ b/Documentation/git-unpack-objects.txt @@ -1,6 +1,5 @@ git-unpack-objects(1) ===================== -v0.1, July 2005 NAME ---- diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt index 2efd5400a7..3d0dea07fb 100644 --- a/Documentation/git-update-server-info.txt +++ b/Documentation/git-update-server-info.txt @@ -1,6 +1,5 @@ git-update-server-info(1) ========================= -v0.1, July 2005 NAME ---- diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt index 98815b6a10..3d8f8ef667 100644 --- a/Documentation/git-upload-pack.txt +++ b/Documentation/git-upload-pack.txt @@ -1,6 +1,5 @@ git-upload-pack(1) ================== -v0.1, July 2005 NAME ---- diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt index c1c7172088..c22d34f5fb 100644 --- a/Documentation/git-var.txt +++ b/Documentation/git-var.txt @@ -1,6 +1,5 @@ git-var(1) ========== -v0.1, July 2005 NAME ---- diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt index b100aa765a..cd74ffd391 100644 --- a/Documentation/git-verify-pack.txt +++ b/Documentation/git-verify-pack.txt @@ -1,10 +1,9 @@ git-verify-pack(1) ================== -v0.1, June 2005 NAME ---- -git-verify-pack - Validate packed GIT archive files. +git-verify-pack - Validate packed git archive files. SYNOPSIS @@ -14,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads given idx file for packed GIT archive created with +Reads given idx file for packed git archive created with git-pack-objects command and verifies idx file and the corresponding pack file. diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index db2efea14c..e6f57d9bc1 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -1,6 +1,5 @@ git-whatchanged(1) ================== -v0.99.4, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-whatchanged - Show logs with difference each commit introduces. SYNOPSIS -------- -'git whatchanged' <option>... +'git-whatchanged' <option>... DESCRIPTION ----------- diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt index 71e16d128a..51be44d1f2 100644 --- a/Documentation/git-write-tree.txt +++ b/Documentation/git-write-tree.txt @@ -1,6 +1,5 @@ git-write-tree(1) ================= -v0.1, May 2005 NAME ---- diff --git a/Documentation/git.txt b/Documentation/git.txt index e141021279..796c4f61ea 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -1,6 +1,5 @@ git(7) ====== -v0.99.6, Sep 2005 NAME ---- @@ -69,6 +68,9 @@ gitlink:git-commit-tree[1]:: gitlink:git-hash-object[1]:: Computes the object ID from a file. +gitlink:git-index-pack.html[1]:: + Build pack index file for an existing packed archive. + gitlink:git-init-db[1]:: Creates an empty git object database @@ -147,7 +149,7 @@ gitlink:git-var[1]:: Displays a git logical variable gitlink:git-verify-pack[1]:: - Validates packed GIT archive files + Validates packed git archive files The interrogate commands may create files - and you can force them to touch the working file set - but in general they don't @@ -164,11 +166,11 @@ gitlink:git-fetch-pack[1]:: Updates from a remote repository. gitlink:git-http-fetch[1]:: - Downloads a remote GIT repository via HTTP + Downloads a remote git repository via HTTP Previously this command was known as git-http-pull. gitlink:git-local-fetch[1]:: - Duplicates another GIT repository on a local system + Duplicates another git repository on a local system Previously this command was known as git-local-pull. gitlink:git-peek-remote[1]:: @@ -323,7 +325,7 @@ gitlink:git-archimport[1]:: Previously this command was known as git-archimport-script. gitlink:git-convert-objects[1]:: - Converts old-style GIT repository + Converts old-style git repository Previously this command was known as git-convert-cache. gitlink:git-cvsimport[1]:: @@ -361,7 +363,7 @@ gitlink:git-count-objects[1]:: Previously this command was known as git-count-objects-script. gitlink:git-daemon[1]:: - A really simple server for GIT repositories. + A really simple server for git repositories. gitlink:git-get-tar-commit-id[1]:: Extract commit ID from an archive created using git-tar-tree. diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index a069b7bb0c..eb7b471024 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -1,5 +1,5 @@ object:: - The unit of storage in GIT. It is uniquely identified by + The unit of storage in git. It is uniquely identified by the SHA1 of its contents. Consequently, an object can not be changed. diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt index 57f4720871..7ee3571bc0 100644 --- a/Documentation/hooks.txt +++ b/Documentation/hooks.txt @@ -1,6 +1,5 @@ -Hooks used by GIT +Hooks used by git ================= -v0.99.6, Sep 2005 Hooks are little scripts you can place in `$GIT_DIR/hooks` directory to trigger action at certain points. When diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 8dbddbf63f..51222b6f3f 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -6,7 +6,7 @@ =============================================================== - Rsync URL: rsync://remote.machine/path/to/repo.git/ - HTTP(s) URL: http://remote.machine/path/to/repo.git/ -- GIT URL: git://remote.machine/path/to/repo.git/ +- git URL: git://remote.machine/path/to/repo.git/ or remote.machine:/path/to/repo.git/ - Local directory: /path/to/repo.git/ =============================================================== diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt index d20fa80d87..1b5f228241 100644 --- a/Documentation/repository-layout.txt +++ b/Documentation/repository-layout.txt @@ -1,6 +1,5 @@ -GIT repository layout +git repository layout ===================== -v0.99.5, Sep 2005 You may find these things in your git repository (`.git` directory for a repository associated with your working tree, or @@ -120,7 +119,7 @@ info/grafts:: info/exclude:: This file, by convention among Porcelains, stores the exclude pattern list. `git status` looks at it, but - otherwise it is not looked at by any of the core GIT + otherwise it is not looked at by any of the core git commands. remotes:: diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 6ecb089c5c..b9f737e964 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -1,6 +1,5 @@ A short git tutorial ==================== -v0.99.5, Aug 2005 Introduction ------------ @@ -163,7 +162,7 @@ you'll have to use the object name, not the filename of the object: git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238 where the `-t` tells `git-cat-file` to tell you what the "type" of the -object is. Git will tell you that you have a "blob" object (ie just a +object is. git will tell you that you have a "blob" object (ie just a regular file), and you can see the contents with git-cat-file "blob" 557db03 @@ -384,7 +383,7 @@ come from the working tree or not. This is not hard to understand, as soon as you realize that git simply never knows (or cares) about files that it is not told about -explicitly. Git will never go *looking* for files to compare, it +explicitly. git will never go *looking* for files to compare, it expects you to tell it what the files are, and that's what the index is there for. ================ @@ -550,7 +549,7 @@ name for the state at that point. Copying repositories -------------------- -Git repositories are normally totally self-sufficient, and it's worth noting +git repositories are normally totally self-sufficient, and it's worth noting that unlike CVS, for example, there is no separate notion of "repository" and "working tree". A git repository normally *is* the working tree, with the local git information hidden in the `.git` @@ -974,7 +973,7 @@ This transport is the same as SSH transport but uses `sh` to run both ends on the local machine instead of running other end on the remote machine via `ssh`. -GIT Native:: +git Native:: `git://remote.machine/path/to/repo.git/` + This transport was designed for anonymous downloading. Like SSH @@ -995,13 +994,13 @@ necessary objects. Because of this behaviour, they are sometimes also called 'commit walkers'. + The 'commit walkers' are sometimes also called 'dumb -transports', because they do not require any GIT aware smart -server like GIT Native transport does. Any stock HTTP server +transports', because they do not require any git aware smart +server like git Native transport does. Any stock HTTP server would suffice. + There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload` programs, which are 'commit walkers'; they outlived their -usefulness when GIT Native and SSH transports were introduced, +usefulness when git Native and SSH transports were introduced, and not used by `git pull` or `git push` scripts. Once you fetch from the remote repository, you `resolve` that @@ -1105,7 +1104,7 @@ done only once. on the remote machine. The communication between the two over the network internally uses an SSH connection. -Your private repository's GIT directory is usually `.git`, but +Your private repository's git directory is usually `.git`, but your public repository is often named after the project name, i.e. `<project>.git`. Let's create such a public repository for project `my-git`. After logging into the remote machine, create @@ -1115,7 +1114,7 @@ an empty directory: mkdir my-git.git ------------ -Then, make that directory into a GIT repository by running +Then, make that directory into a git repository by running `git init-db`, but this time, since its name is not the usual `.git`, we do things slightly differently: |