* "git add -p" is a short-hand to go directly to the selective patch
subcommand in the interactive command loop and to exit when done.
- * "git add -i" UI has been colorized.
+ * "git add -i" UI has been colorized. The interactive prompt
+ and menu can be colored by setting color.interactive
+ configuration. The diff output (including the hunk picker)
+ are colored with color.diff configuration.
* "git commit --allow-empty" allows you to create a single-parent
commit that records the same tree as its parent, overriding the usual
a UI mistake. Use "git stash save random-text", or "git stash"
(without extra args) for that.
+ * "git stash clear extra-text" does not clear the whole stash
+ anymore. It is tempting to expect "git stash clear stash@{2}"
+ to drop only a single named stash entry, and it is rude to
+ discard everything when that is asked (but not provided).
+
* "git prune --expire <time>" can exempt young loose objects from
getting pruned.
* "git config" did not work correctly on platforms that define
REG_NOMATCH to an even number.
+ * Recent versions of AsciiDoc 8 has a change to break our
+ documentation; a workaround has been implemented.
+
--
exec >/var/tmp/1
-O=v1.5.4-rc2-37-ge0cd252
+O=v1.5.4-rc2-59-g2370781
echo O=`git describe refs/heads/master`
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
Show raw timestamp (Default: off).
-S <revs-file>::
- Use revs from revs-file instead of calling gitlink:git-rev-list[1].
+ Use revs from revs-file instead of calling linkgit:git-rev-list[1].
-p, --porcelain::
Show in a format designed for machine consumption.
-gitlink:git-annotate[1]::
+linkgit:git-annotate[1]::
Annotate file lines with commit info.
-gitlink:git-blame[1]::
+linkgit:git-blame[1]::
Show what revision and author last modified each line of a file.
-gitlink:git-cherry[1]::
+linkgit:git-cherry[1]::
Find commits not merged upstream.
-gitlink:git-count-objects[1]::
+linkgit:git-count-objects[1]::
Count unpacked number of objects and their disk consumption.
-gitlink:git-fsck[1]::
+linkgit:git-fsck[1]::
Verifies the connectivity and validity of the objects in the database.
-gitlink:git-get-tar-commit-id[1]::
+linkgit:git-get-tar-commit-id[1]::
Extract commit ID from an archive created using git-archive.
-gitlink:git-help[1]::
+linkgit:git-help[1]::
display help information about git.
-gitlink:git-instaweb[1]::
+linkgit:git-instaweb[1]::
Instantly browse your working repository in gitweb.
-gitlink:git-merge-tree[1]::
+linkgit:git-merge-tree[1]::
Show three-way merge without touching index.
-gitlink:git-rerere[1]::
+linkgit:git-rerere[1]::
Reuse recorded resolution of conflicted merges.
-gitlink:git-rev-parse[1]::
+linkgit:git-rev-parse[1]::
Pick out and massage parameters.
-gitlink:git-show-branch[1]::
+linkgit:git-show-branch[1]::
Show branches and their commits.
-gitlink:git-verify-tag[1]::
+linkgit:git-verify-tag[1]::
Check the GPG signature of tags.
-gitlink:git-whatchanged[1]::
+linkgit:git-whatchanged[1]::
Show logs with difference each commit introduces.
-gitlink:git-config[1]::
+linkgit:git-config[1]::
Get and set repository or global options.
-gitlink:git-fast-export[1]::
+linkgit:git-fast-export[1]::
Git data exporter.
-gitlink:git-fast-import[1]::
+linkgit:git-fast-import[1]::
Backend for fast Git data importers.
-gitlink:git-filter-branch[1]::
+linkgit:git-filter-branch[1]::
Rewrite branches.
-gitlink:git-lost-found[1]::
+linkgit:git-lost-found[1]::
(deprecated) Recover lost refs that luckily have not yet been pruned.
-gitlink:git-mergetool[1]::
+linkgit:git-mergetool[1]::
Run merge conflict resolution tools to resolve merge conflicts.
-gitlink:git-pack-refs[1]::
+linkgit:git-pack-refs[1]::
Pack heads and tags for efficient repository access.
-gitlink:git-prune[1]::
+linkgit:git-prune[1]::
Prune all unreachable objects from the object database.
-gitlink:git-reflog[1]::
+linkgit:git-reflog[1]::
Manage reflog information.
-gitlink:git-relink[1]::
+linkgit:git-relink[1]::
Hardlink common objects in local repositories.
-gitlink:git-remote[1]::
+linkgit:git-remote[1]::
manage set of tracked repositories.
-gitlink:git-repack[1]::
+linkgit:git-repack[1]::
Pack unpacked objects in a repository.
-gitlink:git-archimport[1]::
+linkgit:git-archimport[1]::
Import an Arch repository into git.
-gitlink:git-cvsexportcommit[1]::
+linkgit:git-cvsexportcommit[1]::
Export a single commit to a CVS checkout.
-gitlink:git-cvsimport[1]::
+linkgit:git-cvsimport[1]::
Salvage your data out of another SCM people love to hate.
-gitlink:git-cvsserver[1]::
+linkgit:git-cvsserver[1]::
A CVS server emulator for git.
-gitlink:git-imap-send[1]::
+linkgit:git-imap-send[1]::
Dump a mailbox from stdin into an imap folder.
-gitlink:git-quiltimport[1]::
+linkgit:git-quiltimport[1]::
Applies a quilt patchset onto the current branch.
-gitlink:git-request-pull[1]::
+linkgit:git-request-pull[1]::
Generates a summary of pending changes.
-gitlink:git-send-email[1]::
+linkgit:git-send-email[1]::
Send a collection of patches as emails.
-gitlink:git-svn[1]::
+linkgit:git-svn[1]::
Bidirectional operation between a single Subversion branch and git.
-gitlink:git-add[1]::
+linkgit:git-add[1]::
Add file contents to the index.
-gitlink:git-am[1]::
+linkgit:git-am[1]::
Apply a series of patches from a mailbox.
-gitlink:git-archive[1]::
+linkgit:git-archive[1]::
Create an archive of files from a named tree.
-gitlink:git-bisect[1]::
+linkgit:git-bisect[1]::
Find the change that introduced a bug by binary search.
-gitlink:git-branch[1]::
+linkgit:git-branch[1]::
List, create, or delete branches.
-gitlink:git-bundle[1]::
+linkgit:git-bundle[1]::
Move objects and refs by archive.
-gitlink:git-checkout[1]::
+linkgit:git-checkout[1]::
Checkout and switch to a branch.
-gitlink:git-cherry-pick[1]::
+linkgit:git-cherry-pick[1]::
Apply the change introduced by an existing commit.
-gitlink:git-citool[1]::
+linkgit:git-citool[1]::
Graphical alternative to git-commit.
-gitlink:git-clean[1]::
+linkgit:git-clean[1]::
Remove untracked files from the working tree.
-gitlink:git-clone[1]::
+linkgit:git-clone[1]::
Clone a repository into a new directory.
-gitlink:git-commit[1]::
+linkgit:git-commit[1]::
Record changes to the repository.
-gitlink:git-describe[1]::
+linkgit:git-describe[1]::
Show the most recent tag that is reachable from a commit.
-gitlink:git-diff[1]::
+linkgit:git-diff[1]::
Show changes between commits, commit and working tree, etc.
-gitlink:git-fetch[1]::
+linkgit:git-fetch[1]::
Download objects and refs from another repository.
-gitlink:git-format-patch[1]::
+linkgit:git-format-patch[1]::
Prepare patches for e-mail submission.
-gitlink:git-gc[1]::
+linkgit:git-gc[1]::
Cleanup unnecessary files and optimize the local repository.
-gitlink:git-grep[1]::
+linkgit:git-grep[1]::
Print lines matching a pattern.
-gitlink:git-gui[1]::
+linkgit:git-gui[1]::
A portable graphical interface to Git.
-gitlink:git-init[1]::
+linkgit:git-init[1]::
Create an empty git repository or reinitialize an existing one.
-gitlink:git-log[1]::
+linkgit:git-log[1]::
Show commit logs.
-gitlink:git-merge[1]::
+linkgit:git-merge[1]::
Join two or more development histories together.
-gitlink:git-mv[1]::
+linkgit:git-mv[1]::
Move or rename a file, a directory, or a symlink.
-gitlink:git-pull[1]::
+linkgit:git-pull[1]::
Fetch from and merge with another repository or a local branch.
-gitlink:git-push[1]::
+linkgit:git-push[1]::
Update remote refs along with associated objects.
-gitlink:git-rebase[1]::
+linkgit:git-rebase[1]::
Forward-port local commits to the updated upstream head.
-gitlink:git-reset[1]::
+linkgit:git-reset[1]::
Reset current HEAD to the specified state.
-gitlink:git-revert[1]::
+linkgit:git-revert[1]::
Revert an existing commit.
-gitlink:git-rm[1]::
+linkgit:git-rm[1]::
Remove files from the working tree and from the index.
-gitlink:git-shortlog[1]::
+linkgit:git-shortlog[1]::
Summarize 'git log' output.
-gitlink:git-show[1]::
+linkgit:git-show[1]::
Show various types of objects.
-gitlink:git-stash[1]::
+linkgit:git-stash[1]::
Stash the changes in a dirty working directory away.
-gitlink:git-status[1]::
+linkgit:git-status[1]::
Show the working tree status.
-gitlink:git-submodule[1]::
+linkgit:git-submodule[1]::
Initialize, update or inspect submodules.
-gitlink:git-tag[1]::
+linkgit:git-tag[1]::
Create, list, delete or verify a tag object signed with GPG.
-gitlink:gitk[1]::
+linkgit:gitk[1]::
The git repository browser.
-gitlink:git-cat-file[1]::
+linkgit:git-cat-file[1]::
Provide content or type/size information for repository objects.
-gitlink:git-diff-files[1]::
+linkgit:git-diff-files[1]::
Compares files in the working tree and the index.
-gitlink:git-diff-index[1]::
+linkgit:git-diff-index[1]::
Compares content and mode of blobs between the index and repository.
-gitlink:git-diff-tree[1]::
+linkgit:git-diff-tree[1]::
Compares the content and mode of blobs found via two tree objects.
-gitlink:git-for-each-ref[1]::
+linkgit:git-for-each-ref[1]::
Output information on each ref.
-gitlink:git-ls-files[1]::
+linkgit:git-ls-files[1]::
Show information about files in the index and the working tree.
-gitlink:git-ls-remote[1]::
+linkgit:git-ls-remote[1]::
List references in a remote repository.
-gitlink:git-ls-tree[1]::
+linkgit:git-ls-tree[1]::
List the contents of a tree object.
-gitlink:git-merge-base[1]::
+linkgit:git-merge-base[1]::
Find as good common ancestors as possible for a merge.
-gitlink:git-name-rev[1]::
+linkgit:git-name-rev[1]::
Find symbolic names for given revs.
-gitlink:git-pack-redundant[1]::
+linkgit:git-pack-redundant[1]::
Find redundant pack files.
-gitlink:git-rev-list[1]::
+linkgit:git-rev-list[1]::
Lists commit objects in reverse chronological order.
-gitlink:git-show-index[1]::
+linkgit:git-show-index[1]::
Show packed archive index.
-gitlink:git-show-ref[1]::
+linkgit:git-show-ref[1]::
List references in a local repository.
-gitlink:git-tar-tree[1]::
+linkgit:git-tar-tree[1]::
(deprecated) Create a tar archive of the files in the named tree object.
-gitlink:git-unpack-file[1]::
+linkgit:git-unpack-file[1]::
Creates a temporary file with a blob's contents.
-gitlink:git-var[1]::
+linkgit:git-var[1]::
Show a git logical variable.
-gitlink:git-verify-pack[1]::
+linkgit:git-verify-pack[1]::
Validate packed git archive files.
-gitlink:git-apply[1]::
+linkgit:git-apply[1]::
Apply a patch on a git index file and a working tree.
-gitlink:git-checkout-index[1]::
+linkgit:git-checkout-index[1]::
Copy files from the index to the working tree.
-gitlink:git-commit-tree[1]::
+linkgit:git-commit-tree[1]::
Create a new commit object.
-gitlink:git-hash-object[1]::
+linkgit:git-hash-object[1]::
Compute object ID and optionally creates a blob from a file.
-gitlink:git-index-pack[1]::
+linkgit:git-index-pack[1]::
Build pack index file for an existing packed archive.
-gitlink:git-merge-file[1]::
+linkgit:git-merge-file[1]::
Run a three-way file merge.
-gitlink:git-merge-index[1]::
+linkgit:git-merge-index[1]::
Run a merge for files needing merging.
-gitlink:git-mktag[1]::
+linkgit:git-mktag[1]::
Creates a tag object.
-gitlink:git-mktree[1]::
+linkgit:git-mktree[1]::
Build a tree-object from ls-tree formatted text.
-gitlink:git-pack-objects[1]::
+linkgit:git-pack-objects[1]::
Create a packed archive of objects.
-gitlink:git-prune-packed[1]::
+linkgit:git-prune-packed[1]::
Remove extra objects that are already in pack files.
-gitlink:git-read-tree[1]::
+linkgit:git-read-tree[1]::
Reads tree information into the index.
-gitlink:git-symbolic-ref[1]::
+linkgit:git-symbolic-ref[1]::
Read and modify symbolic refs.
-gitlink:git-unpack-objects[1]::
+linkgit:git-unpack-objects[1]::
Unpack objects from a packed archive.
-gitlink:git-update-index[1]::
+linkgit:git-update-index[1]::
Register file contents in the working tree to the index.
-gitlink:git-update-ref[1]::
+linkgit:git-update-ref[1]::
Update the object name stored in a ref safely.
-gitlink:git-write-tree[1]::
+linkgit:git-write-tree[1]::
Create a tree object from the current index.
-gitlink:git-check-attr[1]::
+linkgit:git-check-attr[1]::
Display gitattributes information..
-gitlink:git-check-ref-format[1]::
+linkgit:git-check-ref-format[1]::
Make sure ref name is well formed.
-gitlink:git-fmt-merge-msg[1]::
+linkgit:git-fmt-merge-msg[1]::
Produce a merge commit message.
-gitlink:git-mailinfo[1]::
+linkgit:git-mailinfo[1]::
Extracts patch and authorship from a single e-mail message.
-gitlink:git-mailsplit[1]::
+linkgit:git-mailsplit[1]::
Simple UNIX mbox splitter program.
-gitlink:git-merge-one-file[1]::
+linkgit:git-merge-one-file[1]::
The standard helper program to use with git-merge-index.
-gitlink:git-patch-id[1]::
+linkgit:git-patch-id[1]::
Compute unique ID for a patch.
-gitlink:git-peek-remote[1]::
+linkgit:git-peek-remote[1]::
(deprecated) List the references in a remote repository.
-gitlink:git-sh-setup[1]::
+linkgit:git-sh-setup[1]::
Common git shell script setup code.
-gitlink:git-stripspace[1]::
+linkgit:git-stripspace[1]::
Filter out empty lines.
-gitlink:git-http-fetch[1]::
+linkgit:git-http-fetch[1]::
Download from a remote git repository via HTTP.
-gitlink:git-http-push[1]::
+linkgit:git-http-push[1]::
Push objects over HTTP/DAV to another repository.
-gitlink:git-parse-remote[1]::
+linkgit:git-parse-remote[1]::
Routines to help parsing remote repository access parameters.
-gitlink:git-receive-pack[1]::
+linkgit:git-receive-pack[1]::
Receive what is pushed into the repository.
-gitlink:git-shell[1]::
+linkgit:git-shell[1]::
Restricted login shell for GIT-only SSH access.
-gitlink:git-upload-archive[1]::
+linkgit:git-upload-archive[1]::
Send archive back to git-archive.
-gitlink:git-upload-pack[1]::
+linkgit:git-upload-pack[1]::
Send objects packed back to git-fetch-pack.
-gitlink:git-daemon[1]::
+linkgit:git-daemon[1]::
A really simple server for git repositories.
-gitlink:git-fetch-pack[1]::
+linkgit:git-fetch-pack[1]::
Receive missing objects from another repository.
-gitlink:git-send-pack[1]::
+linkgit:git-send-pack[1]::
Push objects over git protocol to another repository.
-gitlink:git-update-server-info[1]::
+linkgit:git-update-server-info[1]::
Update auxiliary info file to help dumb servers.
core.fileMode::
If false, the executable bit differences between the index and
the working copy are ignored; useful on broken filesystems like FAT.
- See gitlink:git-update-index[1]. True by default.
+ See linkgit:git-update-index[1]. True by default.
core.quotepath::
The commands that output paths (e.g. `ls-files`,
core.symlinks::
If false, symbolic links are checked out as small plain files that
- contain the link text. gitlink:git-update-index[1] and
- gitlink:git-add[1] will not change the recorded type to regular
+ contain the link text. linkgit:git-update-index[1] and
+ linkgit:git-add[1] will not change the recorded type to regular
file. Useful on filesystems like FAT that do not support
symbolic links. True by default.
The working copy files are assumed to stay unchanged until you
mark them otherwise manually - Git will not detect the file changes
by lstat() calls. This is useful on systems where those are very
- slow, such as Microsoft Windows. See gitlink:git-update-index[1].
+ slow, such as Microsoft Windows. See linkgit:git-update-index[1].
False by default.
core.preferSymlinkRefs::
If true this repository is assumed to be 'bare' and has no
working directory associated with it. If this is the case a
number of commands that require a working directory will be
- disabled, such as gitlink:git-add[1] or gitlink:git-merge[1].
+ disabled, such as linkgit:git-add[1] or linkgit:git-merge[1].
+
-This setting is automatically guessed by gitlink:git-clone[1] or
-gitlink:git-init[1] when the repository was created. By default a
+This setting is automatically guessed by linkgit:git-clone[1] or
+linkgit:git-init[1] when the repository was created. By default a
repository that ends in "/.git" is assumed to be not bare (bare =
false), while all other repositories are assumed to be bare (bare
= true).
group-writable). When 'all' (or 'world' or 'everybody'), the
repository will be readable by all users, additionally to being
group-shareable. When 'umask' (or 'false'), git will use permissions
- reported by umask(2). See gitlink:git-init[1]. False by default.
+ reported by umask(2). See linkgit:git-init[1]. False by default.
core.warnAmbiguousRefs::
If true, git will warn you if the ref name you passed it is ambiguous
In addition to '.gitignore' (per-directory) and
'.git/info/exclude', git looks into this file for patterns
of files which are not meant to be tracked. See
- gitlink:gitignore[5].
+ linkgit:gitignore[5].
core.editor::
Commands such as `commit` and `tag` that lets you edit
space characters as an error (not enabled by default).
alias.*::
- Command aliases for the gitlink:git[1] command wrapper - e.g.
+ Command aliases for the linkgit:git[1] command wrapper - e.g.
after defining "alias.last = cat-file commit HEAD", the invocation
"git last" is equivalent to "git cat-file commit HEAD". To avoid
confusion and troubles with script usage, aliases that
apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
- as the '--whitespace' option. See gitlink:git-apply[1].
+ as the '--whitespace' option. See linkgit:git-apply[1].
branch.autosetupmerge::
Tells `git-branch` and `git-checkout` to setup new branches
- so that gitlink:git-pull[1] will appropriately merge from that
+ so that linkgit:git-pull[1] will appropriately merge from that
remote branch. Note that even if this option is not set,
this behavior can be chosen per-branch using the `--track`
and `--no-track` options. This option defaults to false.
branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and
- supported options are equal to that of gitlink:git-merge[1], but
+ supported options are equal to that of linkgit:git-merge[1], but
option values containing whitespace characters are currently not
supported.
When true, rebase the branch <name> on top of the fetched branch,
instead of merging the default branch from the default remote.
*NOTE*: this is a possibly dangerous operation; do *not* use
- it unless you understand the implications (see gitlink:git-rebase[1]
+ it unless you understand the implications (see linkgit:git-rebase[1]
for details).
clean.requireForce::
color.branch::
A boolean to enable/disable color in the output of
- gitlink:git-branch[1]. May be set to `always`,
+ linkgit:git-branch[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used
only when the output is to a terminal. Defaults to false.
in color.branch.<slot>.
color.interactive::
- When set to `always`, always use colors in `git add --interactive`.
+ When set to `always`, always use colors for interactive prompts
+ and displays (such as those used by "git add --interactive").
When false (or `never`), never. When set to `true` or `auto`, use
colors only when the output is to the terminal. Defaults to false.
color.status::
A boolean to enable/disable color in the output of
- gitlink:git-status[1]. May be set to `always`,
+ linkgit:git-status[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used
only when the output is to a terminal. Defaults to false.
performed using the internal diff machinery, but using the
given command. Note: if you want to use an external diff
program only on a subset of your files, you might want to
- use gitlink:gitattributes[5] instead.
+ use linkgit:gitattributes[5] instead.
diff.renameLimit::
The number of files to consider when performing the copy/rename
A boolean which can enable sequence numbers in patch subjects.
Setting this option to "auto" will enable it only if there is
more than one patch. See --numbered option in
- gitlink:git-format-patch[1].
+ linkgit:git-format-patch[1].
format.headers::
Additional email headers to include in a patch to be submitted
- by mail. See gitlink:git-format-patch[1].
+ by mail. See linkgit:git-format-patch[1].
format.suffix::
The default for format-patch is to output files with the suffix
gc.rerereresolved::
Records of conflicted merge you resolved earlier are
kept for this many days when `git rerere gc` is run.
- The default is 60 days. See gitlink:git-rerere[1].
+ The default is 60 days. See linkgit:git-rerere[1].
gc.rerereunresolved::
Records of conflicted merge you have not resolved are
kept for this many days when `git rerere gc` is run.
- The default is 15 days. See gitlink:git-rerere[1].
+ The default is 15 days. See linkgit:git-rerere[1].
rerere.enabled::
Activate recording of resolved conflicts, so that identical
conflict hunks can be resolved automatically, should they
- be encountered again. gitlink:git-rerere[1] command is by
+ be encountered again. linkgit:git-rerere[1] command is by
default enabled, but can be disabled by setting this option to
false.
gitcvs.enabled::
Whether the CVS server interface is enabled for this repository.
- See gitlink:git-cvsserver[1].
+ See linkgit:git-cvsserver[1].
gitcvs.logfile::
Path to a log file where the CVS server interface well... logs
- various stuff. See gitlink:git-cvsserver[1].
+ various stuff. See linkgit:git-cvsserver[1].
gitcvs.allbinary::
If true, all files are sent to the client in mode '-kb'. This
derived from the git repository. The exact meaning depends on the
used database driver, for SQLite (which is the default driver) this
is a filename. Supports variable substitution (see
- gitlink:git-cvsserver[1] for details). May not contain semicolons (`;`).
+ linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
Default: '%Ggitcvs.%m.sqlite'
gitcvs.dbdriver::
with 'DBD::SQLite', reported to work with 'DBD::Pg', and
reported *not* to work with 'DBD::mysql'. Experimental feature.
May not contain double colons (`:`). Default: 'SQLite'.
- See gitlink:git-cvsserver[1].
+ See linkgit:git-cvsserver[1].
gitcvs.dbuser, gitcvs.dbpass::
Database user and password. Only useful if setting 'gitcvs.dbdriver',
since SQLite has no concept of database users and/or passwords.
'gitcvs.dbuser' supports variable substitution (see
- gitlink:git-cvsserver[1] for details).
+ linkgit:git-cvsserver[1] for details).
All gitcvs variables except for 'gitcvs.allbinary' can also be
specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
http.proxy::
Override the HTTP proxy, normally configured using the 'http_proxy'
- environment variable (see gitlink:curl[1]). This can be overridden
+ environment variable (see linkgit:curl[1]). This can be overridden
on a per-remote basis; see remote.<name>.proxy
http.sslVerify::
does not care per se, but this information is necessary e.g. when
importing commits from emails or in the gitk graphical history
browser (and possibly at other places in the future or in other
- porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'.
+ porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
i18n.logOutputEncoding::
Character encoding the commit messages are converted to when
log.showroot::
If true, the initial commit will be shown as a big creation event.
This is equivalent to a diff against an empty tree.
- Tools like gitlink:git-log[1] or gitlink:git-whatchanged[1], which
+ Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
normally hide the root commit will now show it. True by default.
merge.summary::
merge.tool::
Controls which merge resolution program is used by
- gitlink:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff",
+ linkgit:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff",
"meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
merge.verbosity::
merge.<driver>.name::
Defines a human readable name for a custom low-level
- merge driver. See gitlink:gitattributes[5] for details.
+ merge driver. See linkgit:gitattributes[5] for details.
merge.<driver>.driver::
Defines the command that implements a custom low-level
- merge driver. See gitlink:gitattributes[5] for details.
+ merge driver. See linkgit:gitattributes[5] for details.
merge.<driver>.recursive::
Names a low-level merge driver to be used when
performing an internal merge between common ancestors.
- See gitlink:gitattributes[5] for details.
+ See linkgit:gitattributes[5] for details.
mergetool.<tool>.path::
Override the path for the given tool. This is useful in case
your tool is not in the PATH.
pack.window::
- The size of the window used by gitlink:git-pack-objects[1] when no
+ The size of the window used by linkgit:git-pack-objects[1] when no
window size is given on the command line. Defaults to 10.
pack.depth::
- The maximum delta depth used by gitlink:git-pack-objects[1] when no
+ The maximum delta depth used by linkgit:git-pack-objects[1] when no
maximum depth is given on the command line. Defaults to 50.
pack.windowMemory::
- The window memory size limit used by gitlink:git-pack-objects[1]
+ The window memory size limit used by linkgit:git-pack-objects[1]
when no limit is given on the command line. The value can be
suffixed with "k", "m", or "g". Defaults to 0, meaning no
limit.
pack.deltaCacheSize::
The maximum memory in bytes used for caching deltas in
- gitlink:git-pack-objects[1].
+ linkgit:git-pack-objects[1].
A value of 0 means no limit. Defaults to 0.
pack.deltaCacheLimit::
The maximum size of a delta, that is cached in
- gitlink:git-pack-objects[1]. Defaults to 1000.
+ linkgit:git-pack-objects[1]. Defaults to 1000.
pack.threads::
Specifies the number of threads to spawn when searching for best
- delta matches. This requires that gitlink:git-pack-objects[1]
+ delta matches. This requires that linkgit:git-pack-objects[1]
be compiled with pthreads otherwise this option is ignored with a
warning. This is meant to reduce packing time on multiprocessor
machines. The required amount of memory for the delta search window
The default merge strategy to use when pulling a single branch.
remote.<name>.url::
- The URL of a remote repository. See gitlink:git-fetch[1] or
- gitlink:git-push[1].
+ The URL of a remote repository. See linkgit:git-fetch[1] or
+ linkgit:git-push[1].
remote.<name>.proxy::
For remotes that require curl (http, https and ftp), the URL to
disable proxying for that remote.
remote.<name>.fetch::
- The default set of "refspec" for gitlink:git-fetch[1]. See
- gitlink:git-fetch[1].
+ The default set of "refspec" for linkgit:git-fetch[1]. See
+ linkgit:git-fetch[1].
remote.<name>.push::
- The default set of "refspec" for gitlink:git-push[1]. See
- gitlink:git-push[1].
+ The default set of "refspec" for linkgit:git-push[1]. See
+ linkgit:git-push[1].
remote.<name>.skipDefaultUpdate::
If true, this remote will be skipped by default when updating
- using the update subcommand of gitlink:git-remote[1].
+ using the update subcommand of linkgit:git-remote[1].
remote.<name>.receivepack::
The default program to execute on the remote side when pushing. See
- option \--exec of gitlink:git-push[1].
+ option \--exec of linkgit:git-push[1].
remote.<name>.uploadpack::
The default program to execute on the remote side when fetching. See
- option \--exec of gitlink:git-fetch-pack[1].
+ option \--exec of linkgit:git-fetch-pack[1].
remote.<name>.tagopt::
Setting this value to --no-tags disables automatic tag following when fetching
remotes.<group>::
The list of remotes which are fetched by "git remote update
- <group>". See gitlink:git-remote[1].
+ <group>". See linkgit:git-remote[1].
repack.usedeltabaseoffset::
- Allow gitlink:git-repack[1] to create packs that uses
+ Allow linkgit:git-repack[1] to create packs that uses
delta-base offset. Defaults to false.
show.difftree::
- The default gitlink:git-diff-tree[1] arguments to be used
- for gitlink:git-show[1].
+ The default linkgit:git-diff-tree[1] arguments to be used
+ for linkgit:git-show[1].
showbranch.default::
- The default set of branches for gitlink:git-show-branch[1].
- See gitlink:git-show-branch[1].
+ The default set of branches for linkgit:git-show-branch[1].
+ See linkgit:git-show-branch[1].
status.relativePaths::
- By default, gitlink:git-status[1] shows paths relative to the
+ By default, linkgit:git-status[1] shows paths relative to the
current directory. Setting this variable to `false` shows paths
relative to the repository root (this was the default for git
prior to v1.5.4).
tar archive entries. The default is 0002, which turns off the
world write bit. The special value "user" indicates that the
archiving user's umask will be used instead. See umask(2) and
- gitlink:git-archive[1].
+ linkgit:git-archive[1].
user.email::
Your email address to be recorded in any newly created commits.
Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
- 'EMAIL' environment variables. See gitlink:git-commit-tree[1].
+ 'EMAIL' environment variables. See linkgit:git-commit-tree[1].
user.name::
Your full name to be recorded in any newly created commits.
Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
- environment variables. See gitlink:git-commit-tree[1].
+ environment variables. See linkgit:git-commit-tree[1].
user.signingkey::
- If gitlink:git-tag[1] is not selecting the key you want it to
+ If linkgit:git-tag[1] is not selecting the key you want it to
automatically when creating a signed tag, you can override the
default selection with this variable. This option is passed
unchanged to gpg's --local-user parameter, so you may specify a key
using any method that gpg supports.
whatchanged.difftree::
- The default gitlink:git-diff-tree[1] arguments to be used
- for gitlink:git-whatchanged[1].
+ The default linkgit:git-diff-tree[1] arguments to be used
+ for linkgit:git-whatchanged[1].
imap::
The configuration variables in the 'imap' section are described
- in gitlink:git-imap-send[1].
+ in linkgit:git-imap-send[1].
receive.unpackLimit::
If the number of objects received in a push is below this
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:00 UTC\r
+Last updated 07-Jan-2008 07:51:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:01 UTC\r
+Last updated 07-Jan-2008 07:51:08 UTC\r
</div>\r
</div>\r
</body>\r
================================
The `pull` command knows where to get updates from because of certain
configuration variables that were set by the first `git clone`
-command; see `git config -l` and the gitlink:git-config[1] man
+command; see `git config -l` and the linkgit:git-config[1] man
page for details.
================================
You can update the shared repository with your changes by first committing
-your changes, and then using the gitlink:git-push[1] command:
+your changes, and then using the linkgit:git-push[1] command:
------------------------------------------------
$ git push origin master
easy way to do this is to give all the team members ssh access to the
machine where the repository is hosted. If you don't want to give them a
full shell on the machine, there is a restricted shell which only allows
-users to do git pushes and pulls; see gitlink:git-shell[1].
+users to do git pushes and pulls; see linkgit:git-shell[1].
Put all the committers in the same group, and make the repository
writable by that group:
First, install version 2.1 or higher of cvsps from
link:http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make
sure it is in your path. Then cd to a checked out CVS working directory
-of the project you are interested in and run gitlink:git-cvsimport[1]:
+of the project you are interested in and run linkgit:git-cvsimport[1]:
-------------------------------------------
$ git cvsimport -C <destination> <module>
----------------------------------------
It is also possible to provide true CVS access to a git repository, so
-that developers can still use CVS; see gitlink:git-cvsserver[1] for
+that developers can still use CVS; see linkgit:git-cvsserver[1] for
details.
Alternative Development Models
--ext-diff::
Allow an external diff helper to be executed. If you set an
- external diff driver with gitlink:gitattributes[5], you need
- to use this option with gitlink:git-log[1] and friends.
+ external diff driver with linkgit:gitattributes[5], you need
+ to use this option with linkgit:git-log[1] and friends.
--no-ext-diff::
Disallow external diff drivers.
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:01 UTC\r
+Last updated 07-Jan-2008 07:51:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Dec-2007 17:57:00 UTC\r
+Last updated 07-Jan-2008 07:51:12 UTC\r
</div>\r
</div>\r
</body>\r
Everybody uses these commands to maintain git repositories.
- * gitlink:git-init[1] or gitlink:git-clone[1] to create a
+ * linkgit:git-init[1] or linkgit:git-clone[1] to create a
new repository.
- * gitlink:git-fsck[1] to check the repository for errors.
+ * linkgit:git-fsck[1] to check the repository for errors.
- * gitlink:git-gc[1] to do common housekeeping tasks such as
+ * linkgit:git-gc[1] to do common housekeeping tasks such as
repack and prune.
Examples
other people, and works alone in a single repository, using the
following commands.
- * gitlink:git-show-branch[1] to see where you are.
+ * linkgit:git-show-branch[1] to see where you are.
- * gitlink:git-log[1] to see what happened.
+ * linkgit:git-log[1] to see what happened.
- * gitlink:git-checkout[1] and gitlink:git-branch[1] to switch
+ * linkgit:git-checkout[1] and linkgit:git-branch[1] to switch
branches.
- * gitlink:git-add[1] to manage the index file.
+ * linkgit:git-add[1] to manage the index file.
- * gitlink:git-diff[1] and gitlink:git-status[1] to see what
+ * linkgit:git-diff[1] and linkgit:git-status[1] to see what
you are in the middle of doing.
- * gitlink:git-commit[1] to advance the current branch.
+ * linkgit:git-commit[1] to advance the current branch.
- * gitlink:git-reset[1] and gitlink:git-checkout[1] (with
+ * linkgit:git-reset[1] and linkgit:git-checkout[1] (with
pathname parameters) to undo changes.
- * gitlink:git-merge[1] to merge between local branches.
+ * linkgit:git-merge[1] to merge between local branches.
- * gitlink:git-rebase[1] to maintain topic branches.
+ * linkgit:git-rebase[1] to maintain topic branches.
- * gitlink:git-tag[1] to mark known point.
+ * linkgit:git-tag[1] to mark known point.
Examples
~~~~~~~~
learn how to communicate with others, and uses these commands in
addition to the ones needed by a standalone developer.
- * gitlink:git-clone[1] from the upstream to prime your local
+ * linkgit:git-clone[1] from the upstream to prime your local
repository.
- * gitlink:git-pull[1] and gitlink:git-fetch[1] from "origin"
+ * linkgit:git-pull[1] and linkgit:git-fetch[1] from "origin"
to keep up-to-date with the upstream.
- * gitlink:git-push[1] to shared repository, if you adopt CVS
+ * linkgit:git-push[1] to shared repository, if you adopt CVS
style shared repository workflow.
- * gitlink:git-format-patch[1] to prepare e-mail submission, if
+ * linkgit:git-format-patch[1] to prepare e-mail submission, if
you adopt Linux kernel-style public forum workflow.
Examples
them and publishes the result for others to use, using these
commands in addition to the ones needed by participants.
- * gitlink:git-am[1] to apply patches e-mailed in from your
+ * linkgit:git-am[1] to apply patches e-mailed in from your
contributors.
- * gitlink:git-pull[1] to merge from your trusted lieutenants.
+ * linkgit:git-pull[1] to merge from your trusted lieutenants.
- * gitlink:git-format-patch[1] to prepare and send suggested
+ * linkgit:git-format-patch[1] to prepare and send suggested
alternative to contributors.
- * gitlink:git-revert[1] to undo botched commits.
+ * linkgit:git-revert[1] to undo botched commits.
- * gitlink:git-push[1] to publish the bleeding edge.
+ * linkgit:git-push[1] to publish the bleeding edge.
Examples
A repository administrator uses the following tools to set up
and maintain access to the repository by developers.
- * gitlink:git-daemon[1] to allow anonymous download from
+ * linkgit:git-daemon[1] to allow anonymous download from
repository.
- * gitlink:git-shell[1] can be used as a 'restricted login shell'
+ * linkgit:git-shell[1] can be used as a 'restricted login shell'
for shared central repository users.
link:howto/update-hook-example.txt[update hook howto] has a good
\--depth=<depth>::
Deepen the history of a 'shallow' repository created by
- `git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
+ `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
by the specified number of commits.
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 11-Dec-2007 08:54:02 UTC\r
+Last updated 07-Jan-2008 07:50:00 UTC\r
</div>\r
</div>\r
</body>\r
globs before the shell) will be silently ignored. The 'add' command can
be used to add ignored files with the `-f` (force) option.
-Please see gitlink:git-commit[1] for alternative ways to add content to a
+Please see linkgit:git-commit[1] for alternative ways to add content to a
commit.
See Also
--------
-gitlink:git-status[1]
-gitlink:git-rm[1]
-gitlink:git-reset[1]
-gitlink:git-mv[1]
-gitlink:git-commit[1]
-gitlink:git-update-index[1]
+linkgit:git-status[1]
+linkgit:git-rm[1]
+linkgit:git-reset[1]
+linkgit:git-mv[1]
+linkgit:git-commit[1]
+linkgit:git-update-index[1]
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:20 UTC\r
+Last updated 07-Jan-2008 07:50:00 UTC\r
</div>\r
</div>\r
</body>\r
area to store extracted patches.
-k, --keep::
- Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
+ Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
-u, --utf8::
- Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
+ Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
The proposed commit log message taken from the e-mail
is re-coded into UTF-8 encoding (configuration variable
`i18n.commitencoding` can be used to specify project's
--no-utf8::
Pass `-n` flag to `git-mailinfo` (see
- gitlink:git-mailinfo[1]).
+ linkgit:git-mailinfo[1]).
-3, --3way::
When the patch does not apply cleanly, fall back on
-b, --binary::
Pass `--allow-binary-replacement` flag to `git-apply`
- (see gitlink:git-apply[1]).
+ (see linkgit:git-apply[1]).
--whitespace=<option>::
- This flag is passed to the `git-apply` (see gitlink:git-apply[1])
+ This flag is passed to the `git-apply` (see linkgit:git-apply[1])
program that applies
the patch.
-C<n>, -p<n>::
- These flags are passed to the `git-apply` (see gitlink:git-apply[1])
+ These flags are passed to the `git-apply` (see linkgit:git-apply[1])
program that applies
the patch.
SEE ALSO
--------
-gitlink:git-apply[1].
+linkgit:git-apply[1].
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:20 UTC\r
+Last updated 07-Jan-2008 07:50:01 UTC\r
</div>\r
</div>\r
</body>\r
SEE ALSO
--------
-gitlink:git-blame[1]
+linkgit:git-blame[1]
AUTHOR
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-Dec-2007 21:33:07 UTC\r
+Last updated 07-Jan-2008 07:50:01 UTC\r
</div>\r
</div>\r
</body>\r
Apply the patch in reverse.
--reject::
- For atomicity, gitlink:git-apply[1] by default fails the whole patch and
+ For atomicity, linkgit:git-apply[1] by default fails the whole patch and
does not touch the working tree when some of the hunks
do not apply. This option makes it apply
the parts of the patch that are applicable, and leave the
ever ignored.
--unidiff-zero::
- By default, gitlink:git-apply[1] expects that the patch being
+ By default, linkgit:git-apply[1] expects that the patch being
applied is a unified diff with at least one line of context.
This provides good safety measures, but breaks down when
applying a diff generated with --unified=0. To bypass these
--apply::
If you use any of the options marked "Turns off
- 'apply'" above, gitlink:git-apply[1] reads and outputs the
+ 'apply'" above, linkgit:git-apply[1] reads and outputs the
information you asked without actually applying the
patch. Give this flag after those flags to also apply
the patch.
considered whitespace errors.
+
By default, the command outputs warning messages but applies the patch.
-When gitlink:git-apply[1] is used for statistics and not applying a
+When linkgit:git-apply[1] is used for statistics and not applying a
patch, it defaults to `nowarn`.
+
You can use different `<action>` to control this
Submodules
----------
-If the patch contains any changes to submodules then gitlink:git-apply[1]
+If the patch contains any changes to submodules then linkgit:git-apply[1]
treats these changes as follows.
If --index is specified (explicitly or implicitly), then the submodule
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:21 UTC\r
+Last updated 07-Jan-2008 07:50:01 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:21 UTC\r
+Last updated 07-Jan-2008 07:50:01 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-Dec-2007 10:19:06 UTC\r
+Last updated 07-Jan-2008 07:50:02 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:22 UTC\r
+Last updated 07-Jan-2008 07:50:02 UTC\r
</div>\r
</div>\r
</body>\r
Also it can limit the range of lines annotated.
This report doesn't tell you anything about lines which have been deleted or
-replaced; you need to use a tool such as gitlink:git-diff[1] or the "pickaxe"
+replaced; you need to use a tool such as linkgit:git-diff[1] or the "pickaxe"
interface briefly mentioned in the following paragraph.
Apart from supporting file annotation, git also supports searching the
include::blame-options.txt[]
-c::
- Use the same output mode as gitlink:git-annotate[1] (Default: off).
+ Use the same output mode as linkgit:git-annotate[1] (Default: off).
--score-debug::
Include debugging information related to the movement of
SEE ALSO
--------
-gitlink:git-annotate[1]
+linkgit:git-annotate[1]
AUTHOR
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Dec-2007 18:56:08 UTC\r
+Last updated 07-Jan-2008 07:50:03 UTC\r
</div>\r
</div>\r
</body>\r
new branch.
When a local branch is started off a remote branch, git can setup the
-branch so that gitlink:git-pull[1] will appropriately merge from that
+branch so that linkgit:git-pull[1] will appropriately merge from that
remote branch. If this behavior is desired, it is possible to make it
the default using the global `branch.autosetupmerge` configuration
flag. Otherwise, it can be chosen per-branch using the `--track`
Use -r together with -d to delete remote-tracking branches. Note, that it
only makes sense to delete remote-tracking branches if they no longer exist
-in remote repository or if gitlink:git-fetch[1] was configured not to fetch
-them again. See also 'prune' subcommand of gitlink:git-remote[1] for way to
+in remote repository or if linkgit:git-fetch[1] was configured not to fetch
+them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to
clean up all obsolete remote-tracking branches.
<branchname>::
The name of the branch to create or delete.
The new branch name must pass all checks defined by
- gitlink:git-check-ref-format[1]. Some of these checks
+ linkgit:git-check-ref-format[1]. Some of these checks
may restrict the characters allowed in a branch name.
<start-point>::
+
<1> Delete remote-tracking branches "todo", "html", "man". Next 'fetch' or
'pull' will create them again unless you configure them not to. See
-gitlink:git-fetch[1].
+linkgit:git-fetch[1].
<2> Delete "test" branch even if the "master" branch (or whichever branch is
currently checked out) does not have all commits from test branch.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:22 UTC\r
+Last updated 07-Jan-2008 07:50:03 UTC\r
</div>\r
</div>\r
</body>\r
rsync, http) cannot be used. This command provides support for
git-fetch and git-pull to operate by packaging objects and references
in an archive at the originating machine, then importing those into
-another repository using gitlink:git-fetch[1] and gitlink:git-pull[1]
+another repository using linkgit:git-fetch[1] and linkgit:git-pull[1]
after moving the archive by some means (i.e., by sneakernet). As no
direct connection between repositories exists, the user must specify a
basis for the bundle that is held by the destination repository: the
printed out.
unbundle <file>::
- Passes the objects in the bundle to gitlink:git-index-pack[1]
+ Passes the objects in the bundle to linkgit:git-index-pack[1]
for storage in the repository, then prints the names of all
defined references. If a reflist is given, only references
matching those in the given list are printed. This command is
really plumbing, intended to be called only by
- gitlink:git-fetch[1].
+ linkgit:git-fetch[1].
[git-rev-list-args...]::
A list of arguments, acceptable to git-rev-parse and
available. This is principally of use to git-fetch, which
expects to receive only those references asked for and not
necessarily everything in the pack (in this case, git-bundle is
- acting like gitlink:git-fetch-pack[1]).
+ acting like linkgit:git-fetch-pack[1]).
SPECIFYING REFERENCES
---------------------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:23 UTC\r
+Last updated 07-Jan-2008 07:50:04 UTC\r
</div>\r
</div>\r
</body>\r
<object>::
The name of the object to show.
For a more complete list of ways to spell object names, see
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
-t::
Instead of the content, show the object type identified by
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Dec-2007 08:15:26 UTC\r
+Last updated 07-Jan-2008 07:50:04 UTC\r
</div>\r
</div>\r
</body>\r
SEE ALSO
--------
-gitlink:gitattributes[5].
+linkgit:gitattributes[5].
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:23 UTC\r
+Last updated 07-Jan-2008 07:50:05 UTC\r
</div>\r
</div>\r
</body>\r
These rules makes it easy for shell script based tools to parse
refnames, pathname expansion by the shell when a refname is used
unquoted (by mistake), and also avoids ambiguities in certain
-refname expressions (see gitlink:git-rev-parse[1]). Namely:
+refname expressions (see linkgit:git-rev-parse[1]). Namely:
. double-dot `..` are often used as in `ref1..ref2`, and in some
context this notation means `{caret}ref1 ref2` (i.e. not in
. colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
value and store it in dstref" in fetch and push operations.
It may also be used to select a specific object such as with
- gitlink:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
+ linkgit:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:23 UTC\r
+Last updated 07-Jan-2008 07:50:04 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:23 UTC\r
+Last updated 07-Jan-2008 07:50:05 UTC\r
</div>\r
</div>\r
</body>\r
-b::
Create a new branch named <new_branch> and start it at
<branch>. The new branch name must pass all checks defined
- by gitlink:git-check-ref-format[1]. Some of these checks
+ by linkgit:git-check-ref-format[1]. Some of these checks
may restrict the characters allowed in a branch name.
--track::
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:24 UTC\r
+Last updated 07-Jan-2008 07:50:06 UTC\r
</div>\r
</div>\r
</body>\r
<commit>::
Commit to cherry-pick.
For a more complete list of ways to spell commits, see
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
-e|--edit::
With this option, `git-cherry-pick` will let you edit the commit
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:24 UTC\r
+Last updated 07-Jan-2008 07:50:06 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:24 UTC\r
+Last updated 07-Jan-2008 07:50:06 UTC\r
</div>\r
</div>\r
</body>\r
A Tcl/Tk based graphical interface to review modified files, stage
them into the index, enter a commit message and record the new
commit onto the current branch. This interface is an alternative
-to the less interactive gitlink:git-commit[1] program.
+to the less interactive linkgit:git-commit[1] program.
git-citool is actually a standard alias for 'git gui citool'.
-See gitlink:git-gui[1] for more details.
+See linkgit:git-gui[1] for more details.
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:24 UTC\r
+Last updated 07-Jan-2008 07:50:06 UTC\r
</div>\r
</div>\r
</body>\r
-x::
Don't use the ignore rules. This allows removing all untracked
files, including build products. This can be used (possibly in
- conjunction with gitlink:git-reset[1]) to create a pristine
+ conjunction with linkgit:git-reset[1]) to create a pristine
working directory to test a clean build.
-X::
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Nov-2007 20:50:31 UTC\r
+Last updated 07-Jan-2008 07:50:07 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Jan-2008 10:31:57 UTC\r
+Last updated 07-Jan-2008 07:50:07 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
This is usually not what an end user wants to run directly. See
-gitlink:git-commit[1] instead.
+linkgit:git-commit[1] instead.
Creates a new commit object based on the provided tree object and
emits the new commit object id on stdout. If no parent is given then
See Also
--------
-gitlink:git-write-tree[1]
+linkgit:git-write-tree[1]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Jan-2008 10:31:57 UTC\r
+Last updated 07-Jan-2008 07:50:07 UTC\r
</div>\r
</div>\r
</body>\r
The content to be added can be specified in several ways:
-1. by using gitlink:git-add[1] to incrementally "add" changes to the
+1. by using linkgit:git-add[1] to incrementally "add" changes to the
index before using the 'commit' command (Note: even modified
files must be "added");
-2. by using gitlink:git-rm[1] to remove files from the working tree
+2. by using linkgit:git-rm[1] to remove files from the working tree
and the index, again before using the 'commit' command;
3. by listing files as arguments to the 'commit' command, in which
by one which files should be part of the commit, before finalizing the
operation. Currently, this is done by invoking `git-add --interactive`.
-The gitlink:git-status[1] command can be used to obtain a
+The linkgit:git-status[1] command can be used to obtain a
summary of what is included by any of the above for the next
commit by giving the same set of parameters you would give to
this command.
If you make a commit and then found a mistake immediately after
-that, you can recover from it with gitlink:git-reset[1].
+that, you can recover from it with linkgit:git-reset[1].
OPTIONS
--------
When recording your own work, the contents of modified files in
your working tree are temporarily stored to a staging area
-called the "index" with gitlink:git-add[1]. A file can be
+called the "index" with linkgit:git-add[1]. A file can be
reverted back, only in the index but not in the working tree,
to that of the last commit with `git-reset HEAD -- <file>`,
which effectively reverts `git-add` and prevents the changes to
this second commit would record the changes to `hello.c` and
`hello.h` as expected.
-After a merge (initiated by either gitlink:git-merge[1] or
-gitlink:git-pull[1]) stops because of conflicts, cleanly merged
+After a merge (initiated by either linkgit:git-merge[1] or
+linkgit:git-pull[1]) stops because of conflicts, cleanly merged
paths are already staged to be committed for you, and paths that
conflicted are left in unmerged state. You would have to first
-check which paths are conflicting with gitlink:git-status[1]
+check which paths are conflicting with linkgit:git-status[1]
and after fixing them manually in your working tree, you would
-stage the result as usual with gitlink:git-add[1]:
+stage the result as usual with linkgit:git-add[1]:
------------
$ git status | grep unmerged
SEE ALSO
--------
-gitlink:git-add[1],
-gitlink:git-rm[1],
-gitlink:git-mv[1],
-gitlink:git-merge[1],
-gitlink:git-commit-tree[1]
+linkgit:git-add[1],
+linkgit:git-rm[1],
+linkgit:git-mv[1],
+linkgit:git-merge[1],
+linkgit:git-commit-tree[1]
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</dt>\r
<dd>\r
<p>\r
- When set to <tt>always</tt>, always use colors in <tt>git add --interactive</tt>.\r
+ When set to <tt>always</tt>, always use colors for interactive prompts\r
+ and displays (such as those used by "git add --interactive").\r
When false (or <tt>never</tt>), never. When set to <tt>true</tt> or <tt>auto</tt>, use\r
colors only when the output is to the terminal. Defaults to false.\r
</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jan-2008 10:50:22 UTC\r
+Last updated 07-Jan-2008 07:50:08 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:26 UTC\r
+Last updated 07-Jan-2008 07:50:09 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Nov-2007 00:12:54 UTC\r
+Last updated 07-Jan-2008 07:50:09 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:26 UTC\r
+Last updated 07-Jan-2008 07:50:10 UTC\r
</div>\r
</div>\r
</body>\r
+
It is not recommended to use this feature if you intend to
export changes back to CVS again later with
-gitlink:git-cvsexportcommit[1].
+linkgit:git-cvsexportcommit[1].
-h::
Print a short usage message and exit.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:27 UTC\r
+Last updated 07-Jan-2008 07:50:10 UTC\r
</div>\r
</div>\r
</body>\r
-------
All these options obviously only make sense if enforced by the server side.
-They have been implemented to resemble the gitlink:git-daemon[1] options as
+They have been implemented to resemble the linkgit:git-daemon[1] options as
closely as possible.
--base-path <path>::
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 18-Dec-2007 06:59:36 UTC\r
+Last updated 07-Jan-2008 07:50:11 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:27 UTC\r
+Last updated 07-Jan-2008 07:50:12 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Dec-2007 17:56:56 UTC\r
+Last updated 07-Jan-2008 07:50:13 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Dec-2007 17:56:56 UTC\r
+Last updated 07-Jan-2008 07:50:13 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Dec-2007 17:56:57 UTC\r
+Last updated 07-Jan-2008 07:50:15 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Dec-2007 17:56:58 UTC\r
+Last updated 07-Jan-2008 07:50:15 UTC\r
</div>\r
</div>\r
</body>\r
the index (staging area for the next commit). In other
words, the differences are what you _could_ tell git to
further add to the index but you still haven't. You can
- stage these changes by using gitlink:git-add[1].
+ stage these changes by using linkgit:git-add[1].
+
If exactly two paths are given, and at least one is untracked,
compare the two files / directories. This behavior can be
<tree-ish>.
For a more complete list of ways to spell <commit>, see
-"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
However, "diff" is about comparing two _endpoints_, not ranges,
and the range notations ("<commit>..<commit>" and
"<commit>\...<commit>") do not mean a range as defined in the
-"SPECIFYING RANGES" section in gitlink:git-rev-parse[1].
+"SPECIFYING RANGES" section in linkgit:git-rev-parse[1].
OPTIONS
-------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Dec-2007 08:28:19 UTC\r
+Last updated 07-Jan-2008 07:50:17 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
This program dumps the given revisions in a form suitable to be piped
-into gitlink:git-fast-import[1].
+into linkgit:git-fast-import[1].
You can use it as a human readable bundle replacement (see
-gitlink:git-bundle[1]), or as a kind of an interactive
-gitlink:git-filter-branch[1].
+linkgit:git-bundle[1]), or as a kind of an interactive
+linkgit:git-filter-branch[1].
OPTIONS
-------
--progress=<n>::
Insert 'progress' statements every <n> objects, to be shown by
- gitlink:git-fast-import[1] during import.
+ linkgit:git-fast-import[1] during import.
--signed-tags=(verbatim|warn|strip|abort)::
Specify how to handle signed tags. Since any transformation
Limitations
-----------
-Since gitlink:git-fast-import[1] cannot tag trees, you will not be
+Since linkgit:git-fast-import[1] cannot tag trees, you will not be
able to export the linux-2.6.git repository completely, as it contains
a tag referencing a tree instead of a commit.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:30 UTC\r
+Last updated 07-Jan-2008 07:50:18 UTC\r
</div>\r
</div>\r
</body>\r
with the newly imported data.
The fast-import backend itself can import into an empty repository (one that
-has already been initialized by gitlink:git-init[1]) or incrementally
+has already been initialized by linkgit:git-init[1]) or incrementally
update an existing populated repository. Whether or not incremental
imports are supported from a particular foreign source depends on
the frontend program in use.
This information may be useful after importing projects
whose total object set exceeds the 4 GiB packfile limit,
as these commits can be used as edge points during calls
- to gitlink:git-pack-objects[1].
+ to linkgit:git-pack-objects[1].
--quiet::
Disable all non-fatal output, making fast-import silent when it
+
An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git
parser is accurate, but a little on the lenient side. It is the
-same parser used by gitlink:git-am[1] when applying patches
+same parser used by linkgit:git-am[1] when applying patches
received from email.
+
Some malformed strings may be accepted as valid dates. In some of
This particular format is supplied as its short to implement and
may be useful to a process that wants to create a new commit
right now, without needing to use a working directory or
-gitlink:git-update-index[1].
+linkgit:git-update-index[1].
+
If separate `author` and `committer` commands are used in a `commit`
the timestamps may not match, as the system clock will be polled
* A complete 40 byte or abbreviated commit SHA-1 in hex.
* Any valid Git SHA-1 expression that resolves to a commit. See
- ``SPECIFYING REVISIONS'' in gitlink:git-rev-parse[1] for details.
+ ``SPECIFYING REVISIONS'' in linkgit:git-rev-parse[1] for details.
The special case of restarting an incremental import from the
current branch value should be written as:
complete set of bytes which normally goes into such a signature.
If signing is required, create lightweight tags from within fast-import with
`reset`, then create the annotated versions of those tags offline
-with the standard gitlink:git-tag[1] process.
+with the standard linkgit:git-tag[1] process.
`reset`
~~~~~~~
When committing fixups, consider using `merge` to connect the
commit(s) which are supplying file revisions to the fixup branch.
-Doing so will allow tools such as gitlink:git-blame[1] to track
+Doing so will allow tools such as linkgit:git-blame[1] to track
through the real commit history and properly annotate the source
files.
~~~~~~~~~~~~~~~~~~~~~~~~~
If you are repacking very old imported data (e.g. older than the
last year), consider expending some extra CPU time and supplying
-\--window=50 (or higher) when you run gitlink:git-repack[1].
+\--window=50 (or higher) when you run linkgit:git-repack[1].
This will take longer, but will also produce a smaller packfile.
You only need to expend the effort once, and everyone using your
project will benefit from the smaller repository.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:30 UTC\r
+Last updated 07-Jan-2008 07:50:18 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-Usually you would want to use gitlink:git-fetch[1] which is a
+Usually you would want to use linkgit:git-fetch[1] which is a
higher level wrapper of this command instead.
Invokes 'git-upload-pack' on a potentially remote repository,
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Nov-2007 20:50:31 UTC\r
+Last updated 07-Jan-2008 07:50:19 UTC\r
</div>\r
</div>\r
</body>\r
SEE ALSO
--------
-gitlink:git-pull[1]
+linkgit:git-pull[1]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:31 UTC\r
+Last updated 07-Jan-2008 07:50:20 UTC\r
</div>\r
</div>\r
</body>\r
This is the filter for modifying the environment in which
the commit will be performed. Specifically, you might want
to rewrite the author/committer name/email/time environment
- variables (see gitlink:git-commit[1] for details). Do not forget
+ variables (see linkgit:git-commit[1] for details). Do not forget
to re-export the variables.
--tree-filter <command>::
--index-filter <command>::
This is the filter for rewriting the index. It is similar to the
tree filter but does not check out the tree, which makes it much
- faster. For hairy cases, see gitlink:git-update-index[1].
+ faster. For hairy cases, see linkgit:git-update-index[1].
--parent-filter <command>::
This is the filter for rewriting the commit's parent list.
It will receive the parent string on stdin and shall output
the new parent string on stdout. The parent string is in
- a format accepted by gitlink:git-commit-tree[1]: empty for
+ a format accepted by linkgit:git-commit-tree[1]: empty for
the initial commit, "-p parent" for a normal commit and
"-p parent1 -p parent2 -p parent3 ..." for a merge commit.
--commit-filter <command>::
This is the filter for performing the commit.
If this filter is specified, it will be called instead of the
- gitlink:git-commit-tree[1] command, with arguments of the form
+ linkgit:git-commit-tree[1] command, with arguments of the form
"<TREE_ID> [-p <PARENT_COMMIT_ID>]..." and the log message on
stdin. The commit id is expected on stdout.
+
You can use the 'map' convenience function in this filter, and other
convenience functions, too. For example, calling 'skip_commit "$@"'
will leave out the current commit (but not its changes! If you want
-that, use gitlink:git-rebase[1] instead).
+that, use linkgit:git-rebase[1] instead).
--tag-name-filter <command>::
This is the filter for rewriting tag names. When passed,
<rev-list-options>::
When options are given after the new branch name, they will
- be passed to gitlink:git-rev-list[1]. Only commits in the resulting
+ be passed to linkgit:git-rev-list[1]. Only commits in the resulting
output will be filtered, although the filtered commits can still
reference parents which are outside of that set.
*NOTE* the changes introduced by the commits, and which are not reverted
by subsequent commits, will still be in the rewritten branch. If you want
to throw out _changes_ together with the commits, you should use the
-interactive mode of gitlink:git-rebase[1].
+interactive mode of linkgit:git-rebase[1].
Consider this history:
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:31 UTC\r
+Last updated 07-Jan-2008 07:50:21 UTC\r
</div>\r
</div>\r
</body>\r
SEE ALSO
--------
-gitlink:git-merge[1]
+linkgit:git-merge[1]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:31 UTC\r
+Last updated 07-Jan-2008 07:50:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Dec-2007 17:56:59 UTC\r
+Last updated 07-Jan-2008 07:50:21 UTC\r
</div>\r
</div>\r
</body>\r
Prepare each commit with its patch in
one file per commit, formatted to resemble UNIX mailbox format.
The output of this command is convenient for e-mail submission or
-for use with gitlink:git-am[1].
+for use with linkgit:git-am[1].
There are two ways to specify which commits to operate on.
that leads to the <since> to be output.
2. Generic <revision range> expression (see "SPECIFYING
- REVISIONS" section in gitlink:git-rev-parse[1]) means the
+ REVISIONS" section in linkgit:git-rev-parse[1]) means the
commits in the specified range.
A single commit, when interpreted as a <revision range>
See Also
--------
-gitlink:git-am[1], gitlink:git-send-email[1]
+linkgit:git-am[1], linkgit:git-send-email[1]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:32 UTC\r
+Last updated 07-Jan-2008 07:50:22 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-This is a synonym for gitlink:git-fsck[1]. Please refer to the
+This is a synonym for linkgit:git-fsck[1]. Please refer to the
documentation of that command.
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:32 UTC\r
+Last updated 07-Jan-2008 07:50:22 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:32 UTC\r
+Last updated 07-Jan-2008 07:50:23 UTC\r
</div>\r
</div>\r
</body>\r
Runs a number of housekeeping tasks within the current repository,
such as compressing file revisions (to reduce disk space and increase
performance) and removing unreachable objects which may have been
-created from prior invocations of gitlink:git-add[1].
+created from prior invocations of linkgit:git-add[1].
Users are encouraged to run this task on a regular basis within
each repository to maintain good disk space utilization and good
much time is spent optimizing the delta compression of the objects in
the repository when the --aggressive option is specified. The larger
the value, the more time is spent optimizing the delta compression. See
-the documentation for the --window' option in gitlink:git-repack[1] for
+the documentation for the --window' option in linkgit:git-repack[1] for
more details. This defaults to 10.
See Also
--------
-gitlink:git-prune[1]
-gitlink:git-reflog[1]
-gitlink:git-repack[1]
-gitlink:git-rerere[1]
+linkgit:git-prune[1]
+linkgit:git-reflog[1]
+linkgit:git-repack[1]
+linkgit:git-rerere[1]
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-Nov-2007 04:52:56 UTC\r
+Last updated 07-Jan-2008 07:50:23 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
Acts as a filter, extracting the commit ID stored in archives created by
-gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its
+linkgit:git-archive[1]. It reads only the first 1024 bytes of input, thus its
runtime is not influenced by the size of <tarfile> very much.
If no commit ID is found, git-get-tar-commit-id quietly exists with a
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:33 UTC\r
+Last updated 07-Jan-2008 07:50:23 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:33 UTC\r
+Last updated 07-Jan-2008 07:50:24 UTC\r
</div>\r
</div>\r
</body>\r
new commits, amending existing ones, creating branches, performing
local merges, and fetching/pushing to remote repositories.
-Unlike gitlink:gitk[1], git-gui focuses on commit generation
+Unlike linkgit:gitk[1], git-gui focuses on commit generation
and single file annotation, and does not show project history.
It does however supply menu actions to start a gitk session from
within git-gui.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:33 UTC\r
+Last updated 07-Jan-2008 07:50:24 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Dec-2007 07:33:00 UTC\r
+Last updated 07-Jan-2008 07:50:25 UTC\r
</div>\r
</div>\r
</body>\r
------------------------------------------------
as they are probably more user specific than repository specific.
-See gitlink:git-config[1] for more information about this.
+See linkgit:git-config[1] for more information about this.
Author
------
Documentation
-------------
-Initial documentation was part of the gitlink:git[7] man page.
+Initial documentation was part of the linkgit:git[7] man page.
Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
little. Maintenance is done by the git-list <git@vger.kernel.org>.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:33 UTC\r
+Last updated 07-Jan-2008 07:50:25 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:33 UTC\r
+Last updated 07-Jan-2008 07:50:25 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:34 UTC\r
+Last updated 07-Jan-2008 07:50:26 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
a default name determined from the pack content. If\r
<pack-file> is not specified consider using --keep to\r
prevent a race condition between this process and\r
- <a href=":git-repack.html">:git-repack(1)</a>.\r
+ <a href="git-repack.html">git-repack(1)</a>.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:34 UTC\r
+Last updated 07-Jan-2008 07:50:26 UTC\r
</div>\r
</div>\r
</body>\r
a default name determined from the pack content. If
<pack-file> is not specified consider using --keep to
prevent a race condition between this process and
- gitlink::git-repack[1].
+ linkgit:git-repack[1].
--fix-thin::
- It is possible for gitlink:git-pack-objects[1] to build
+ It is possible for linkgit:git-pack-objects[1] to build
"thin" pack, which records objects in deltified form based on
objects not included in the pack to reduce network traffic.
Those objects are expected to be present on the receiving end
Before moving the index into its final destination
create an empty .keep file for the associated pack file.
This option is usually necessary with --stdin to prevent a
- simultaneous gitlink:git-repack[1] process from deleting
+ simultaneous linkgit:git-repack[1] process from deleting
the newly constructed pack and index before refs can be
updated to use objects contained in the pack.
and the SHA1 hash of that list is printed to stdout. If --stdin was
also used then this is prefixed by either "pack\t", or "keep\t" if a
new .keep file was successfully created. This is useful to remove a
-.keep file used as a lock to prevent the race with gitlink:git-repack[1]
+.keep file used as a lock to prevent the race with linkgit:git-repack[1]
mentioned above.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:34 UTC\r
+Last updated 07-Jan-2008 07:50:26 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-This is a synonym for gitlink:git-init[1]. Please refer to the
+This is a synonym for linkgit:git-init[1]. Please refer to the
documentation of that command.
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Dec-2007 07:33:00 UTC\r
+Last updated 07-Jan-2008 07:50:27 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Dec-2007 02:42:55 UTC\r
+Last updated 07-Jan-2008 07:50:27 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Jan-2008 10:31:57 UTC\r
+Last updated 07-Jan-2008 07:50:27 UTC\r
</div>\r
</div>\r
</body>\r
-----------
Shows the commit logs.
-The command takes options applicable to the gitlink:git-rev-list[1]
+The command takes options applicable to the linkgit:git-rev-list[1]
command to control what is shown and how, and options applicable to
-the gitlink:git-diff-tree[1] commands to control how the changes
+the linkgit:git-diff-tree[1] commands to control how the changes
each commit introduces are shown.
This manual page describes only the most frequently used options.
`HEAD`, i.e. the tip of the current branch.
For a more complete list of ways to spell <since>
and <until>, see "SPECIFYING REVISIONS" section in
- gitlink:git-rev-parse[1].
+ linkgit:git-rev-parse[1].
--first-parent::
Follow only the first parent commit upon seeing a merge
Show commits as they were recorded in the reflog. The log contains
a record about how the tip of a reference was changed.
Cannot be combined with --reverse.
- See also gitlink:git-reflog[1].
+ See also linkgit:git-reflog[1].
--decorate::
Print out the ref names of any commits that are shown.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:35 UTC\r
+Last updated 07-Jan-2008 07:50:28 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-*NOTE*: this command is deprecated. Use gitlink:git-fsck[1] with
+*NOTE*: this command is deprecated. Use linkgit:git-fsck[1] with
the option '--lost-found' instead.
Finds dangling commits and tags from the object database, and
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Dec-2007 08:15:26 UTC\r
+Last updated 07-Jan-2008 07:50:29 UTC\r
</div>\r
</div>\r
</body>\r
-v::
Similar to `-t`, but use lowercase letters for files
that are marked as 'assume unchanged' (see
- gitlink:git-update-index[1]).
+ linkgit:git-update-index[1]).
--full-name::
When run from a subdirectory, the command usually
'git-ls-files' can use a list of "exclude patterns" when
traversing the directory tree and finding files to show when the
-flags --others or --ignored are specified. gitlink:gitignore[5]
+flags --others or --ignored are specified. linkgit:gitignore[5]
specifies the format of exclude patterns.
These exclude patterns come from these places, in order:
See Also
--------
-gitlink:git-read-tree[1], gitlink:gitignore[5]
+linkgit:git-read-tree[1], linkgit:gitignore[5]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 18-Dec-2007 06:59:37 UTC\r
+Last updated 07-Jan-2008 07:50:29 UTC\r
</div>\r
</div>\r
</body>\r
displayed.
-u <exec>, --upload-pack=<exec>::
- Specify the full path of gitlink:git-upload-pack[1] on the remote
+ Specify the full path of linkgit:git-upload-pack[1] on the remote
host. This allows listing references from repositories accessed via
SSH and where the SSH daemon does not use the PATH configured by the
user.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:36 UTC\r
+Last updated 07-Jan-2008 07:50:30 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:36 UTC\r
+Last updated 07-Jan-2008 07:50:30 UTC\r
</div>\r
</div>\r
</body>\r
<patch> file. The author name, e-mail and e-mail subject are
written out to the standard output to be used by git-am
to create a commit. It is usually not necessary to use this
-command directly. See gitlink:git-am[1] instead.
+command directly. See linkgit:git-am[1] instead.
OPTIONS
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:36 UTC\r
+Last updated 07-Jan-2008 07:50:30 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:36 UTC\r
+Last updated 07-Jan-2008 07:50:31 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:36 UTC\r
+Last updated 07-Jan-2008 07:50:31 UTC\r
</div>\r
</div>\r
</body>\r
git-merge-file is designed to be a minimal clone of RCS merge, that is, it
implements all of RCS merge's functionality which is needed by
-gitlink:git[1].
+linkgit:git[1].
OPTIONS
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:36 UTC\r
+Last updated 07-Jan-2008 07:50:31 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:37 UTC\r
+Last updated 07-Jan-2008 07:50:32 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:37 UTC\r
+Last updated 07-Jan-2008 07:50:32 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Dec-2007 08:15:27 UTC\r
+Last updated 07-Jan-2008 07:50:33 UTC\r
</div>\r
</div>\r
</body>\r
If you tried a merge which resulted in a complex conflicts and
would want to start over, you can recover with
-gitlink:git-reset[1].
+linkgit:git-reset[1].
CONFIGURATION
-------------
SEE ALSO
--------
-gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1],
-gitlink:gitattributes[5]
+linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
+linkgit:gitattributes[5]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:37 UTC\r
+Last updated 07-Jan-2008 07:50:32 UTC\r
</div>\r
</div>\r
</body>\r
-----------
Use 'git mergetool' to run one of several merge utilities to resolve
-merge conflicts. It is typically run after gitlink:git-merge[1].
+merge conflicts. It is typically run after linkgit:git-merge[1].
If one or more <file> parameters are given, the merge tool program will
be run to resolve differences on each file. If no <file> names are
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:38 UTC\r
+Last updated 07-Jan-2008 07:50:33 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:38 UTC\r
+Last updated 07-Jan-2008 07:50:34 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:39 UTC\r
+Last updated 07-Jan-2008 07:50:34 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
Instead of printing both the SHA-1 and the name, print only\r
the name. If given with --tags the usual tag prefix of\r
"tags/" is also omitted from the name, matching the output\r
- of <a href=":git-describe.html">:git-describe(1)</a> more closely. This option\r
+ of <a href="git-describe.html">git-describe(1)</a> more closely. This option\r
cannot be combined with --stdin.\r
</p>\r
</dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:40 UTC\r
+Last updated 07-Jan-2008 07:50:34 UTC\r
</div>\r
</div>\r
</body>\r
Instead of printing both the SHA-1 and the name, print only
the name. If given with --tags the usual tag prefix of
"tags/" is also omitted from the name, matching the output
- of gitlink::git-describe[1] more closely. This option
+ of linkgit:git-describe[1] more closely. This option
cannot be combined with --stdin.
EXAMPLE
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:40 UTC\r
+Last updated 07-Jan-2008 07:50:35 UTC\r
</div>\r
</div>\r
</body>\r
--revs::
Read the revision arguments from the standard input, instead of
individual object names. The revision arguments are processed
- the same way as gitlink:git-rev-list[1] with `--objects` flag
+ the same way as linkgit:git-rev-list[1] with `--objects` flag
uses its `commit` arguments to build the list of objects it
outputs. The objects on the resulting list are packed.
See Also
--------
-gitlink:git-rev-list[1]
-gitlink:git-repack[1]
-gitlink:git-prune-packed[1]
+linkgit:git-rev-list[1]
+linkgit:git-repack[1]
+linkgit:git-prune-packed[1]
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:40 UTC\r
+Last updated 07-Jan-2008 07:50:34 UTC\r
</div>\r
</div>\r
</body>\r
See Also
--------
-gitlink:git-pack-objects[1]
-gitlink:git-repack[1]
-gitlink:git-prune-packed[1]
+linkgit:git-pack-objects[1]
+linkgit:git-repack[1]
+linkgit:git-prune-packed[1]
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:40 UTC\r
+Last updated 07-Jan-2008 07:50:35 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:40 UTC\r
+Last updated 07-Jan-2008 07:50:35 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:41 UTC\r
+Last updated 07-Jan-2008 07:50:36 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 18-Dec-2007 06:59:38 UTC\r
+Last updated 07-Jan-2008 07:50:36 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:41 UTC\r
+Last updated 07-Jan-2008 07:50:36 UTC\r
</div>\r
</div>\r
</body>\r
See Also
--------
-gitlink:git-pack-objects[1]
-gitlink:git-repack[1]
+linkgit:git-pack-objects[1]
+linkgit:git-repack[1]
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Dec-2007 09:57:29 UTC\r
+Last updated 07-Jan-2008 07:50:36 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Dec-2007 09:57:29 UTC\r
+Last updated 07-Jan-2008 07:50:37 UTC\r
</div>\r
</div>\r
</body>\r
*NOTE:* This is a potentially _dangerous_ mode of operation.
It rewrites history, which does not bode well when you
published that history already. Do *not* use this option
- unless you have read gitlink:git-rebase[1] carefully.
+ unless you have read linkgit:git-rebase[1] carefully.
\--no-rebase::
Override earlier \--rebase.
current branch. Normally the branch merged in is
the HEAD of the remote repository, but the choice is
determined by the branch.<name>.remote and
- branch.<name>.merge options; see gitlink:git-config[1]
+ branch.<name>.merge options; see linkgit:git-config[1]
for details.
git pull origin next::
If you tried a pull which resulted in a complex conflicts and
would want to start over, you can recover with
-gitlink:git-reset[1].
+linkgit:git-reset[1].
SEE ALSO
--------
-gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1]
+linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Nov-2007 04:55:50 UTC\r
+Last updated 07-Jan-2008 07:50:37 UTC\r
</div>\r
</div>\r
</body>\r
You can make interesting things happen to a repository
every time you push into it, by setting up 'hooks' there. See
-documentation for gitlink:git-receive-pack[1].
+documentation for linkgit:git-receive-pack[1].
OPTIONS
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:42 UTC\r
+Last updated 07-Jan-2008 07:50:38 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:43 UTC\r
+Last updated 07-Jan-2008 07:50:38 UTC\r
</div>\r
</div>\r
</body>\r
-----------
Reads the tree information given by <tree-ish> into the index,
but does not actually *update* any of the files it "caches". (see:
-gitlink:git-checkout-index[1])
+linkgit:git-checkout-index[1])
Optionally, it can merge a tree into the index, perform a
fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m`
See Also
--------
-gitlink:git-write-tree[1]; gitlink:git-ls-files[1];
-gitlink:gitignore[5]
+linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
+linkgit:gitignore[5]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:43 UTC\r
+Last updated 07-Jan-2008 07:50:39 UTC\r
</div>\r
</div>\r
</body>\r
--whitespace=<nowarn|warn|error|error-all|strip>::
This flag is passed to the `git-apply` program
- (see gitlink:git-apply[1]) that applies the patch.
+ (see linkgit:git-apply[1]) that applies the patch.
-i, \--interactive::
Make a list of the commits which are about to be rebased. Let the
However, the working tree stays the same.
- Now add the changes to the index that you want to have in the first
- commit. You can use gitlink:git-add[1] (possibly interactively) and/or
- gitlink:git-gui[1] to do that.
+ commit. You can use linkgit:git-add[1] (possibly interactively) and/or
+ linkgit:git-gui[1] to do that.
- Commit the now-current index with whatever commit message is appropriate
now.
If you are not absolutely sure that the intermediate revisions are
consistent (they compile, pass the testsuite, etc.) you should use
-gitlink:git-stash[1] to stash away the not-yet-committed changes
+linkgit:git-stash[1] to stash away the not-yet-committed changes
after each commit, test, and amend the commit if fixes are necessary.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:44 UTC\r
+Last updated 07-Jan-2008 07:50:39 UTC\r
</div>\r
</div>\r
</body>\r
SEE ALSO
--------
-gitlink:git-send-pack[1]
+linkgit:git-send-pack[1]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Nov-2007 08:54:17 UTC\r
+Last updated 07-Jan-2008 07:50:40 UTC\r
</div>\r
</div>\r
</body>\r
Entries older than `expire` time, or entries older than
`expire-unreachable` time and are not reachable from the current
tip, are removed from the reflog. This is typically not used
-directly by the end users -- instead, see gitlink:git-gc[1].
+directly by the end users -- instead, see linkgit:git-gc[1].
The subcommand "show" (which is also the default, in the absence of any
subcommands) will take all the normal log options, and show the log of
the reference provided in the command-line (or `HEAD`, by default).
The reflog will cover all recent actions (HEAD reflog records branch switching
as well). It is an alias for 'git log -g --abbrev-commit --pretty=oneline';
-see gitlink:git-log[1].
+see linkgit:git-log[1].
The reflog is useful in various git commands, to specify the old value
of a reference. For example, `HEAD@\{2\}` means "where HEAD used to be
two moves ago", `master@\{one.week.ago\}` means "where master used to
-point to one week ago", and so on. See gitlink:git-rev-parse[1] for
+point to one week ago", and so on. See linkgit:git-rev-parse[1] for
more details.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:44 UTC\r
+Last updated 07-Jan-2008 07:50:41 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-Nov-2007 04:52:56 UTC\r
+Last updated 07-Jan-2008 07:50:41 UTC\r
</div>\r
</div>\r
</body>\r
the configuration parameter remotes.default will get used; if
remotes.default is not defined, all remotes which do not have the
configuration parameter remote.<name>.skipDefaultUpdate set to true will
-be updated. (See gitlink:git-config[1]).
+be updated. (See linkgit:git-config[1]).
DISCUSSION
The remote configuration is achieved using the `remote.origin.url` and
`remote.origin.fetch` configuration variables. (See
-gitlink:git-config[1]).
+linkgit:git-config[1]).
Examples
--------
See Also
--------
-gitlink:git-fetch[1]
-gitlink:git-branch[1]
-gitlink:git-config[1]
+linkgit:git-fetch[1]
+linkgit:git-branch[1]
+linkgit:git-config[1]
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:45 UTC\r
+Last updated 07-Jan-2008 07:50:41 UTC\r
</div>\r
</div>\r
</body>\r
-d::
After packing, if the newly created packs make some
existing packs redundant, remove the redundant packs.
- Also runs gitlink:git-prune-packed[1].
+ Also runs linkgit:git-prune-packed[1].
-l::
Pass the `--local` option to `git pack-objects`, see
- gitlink:git-pack-objects[1].
+ linkgit:git-pack-objects[1].
-f::
Pass the `--no-reuse-delta` option to `git pack-objects`, see
- gitlink:git-pack-objects[1].
+ linkgit:git-pack-objects[1].
-q::
Pass the `-q` option to `git pack-objects`, see
- gitlink:git-pack-objects[1].
+ linkgit:git-pack-objects[1].
-n::
Do not update the server information with
See Also
--------
-gitlink:git-pack-objects[1]
-gitlink:git-prune-packed[1]
+linkgit:git-pack-objects[1]
+linkgit:git-prune-packed[1]
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:45 UTC\r
+Last updated 07-Jan-2008 07:50:42 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-This is a synonym for gitlink:git-config[1]. Please refer to the
+This is a synonym for linkgit:git-config[1]. Please refer to the
documentation of that command.
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:45 UTC\r
+Last updated 07-Jan-2008 07:50:42 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Dec-2007 10:59:13 UTC\r
+Last updated 07-Jan-2008 07:50:42 UTC\r
</div>\r
</div>\r
</body>\r
'clear'::
This resets the metadata used by rerere if a merge resolution is to be
-is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
+is aborted. Calling linkgit:git-am[1] --skip or linkgit:git-rebase[1]
[--skip|--abort] will automatically invoke this command.
'diff'::
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Jan-2008 10:31:57 UTC\r
+Last updated 07-Jan-2008 07:50:43 UTC\r
</div>\r
</div>\r
</body>\r
the undo in the history.
If you want to undo a commit other than the latest on a branch,
-gitlink:git-revert[1] is your friend.
+linkgit:git-revert[1] is your friend.
The second form with 'paths' is used to revert selected paths in
the index from a given commit, without moving HEAD.
--soft::
Does not touch the index file nor the working tree at all, but
requires them to be in a good order. This leaves all your changed
- files "Added but not yet committed", as gitlink:git-status[1] would
+ files "Added but not yet committed", as linkgit:git-status[1] would
put it.
--hard::
commit by starting with its log message. If you do not need to
edit the message further, you can give -C option instead.
+
-See also the --amend option to gitlink:git-commit[1].
+See also the --amend option to linkgit:git-commit[1].
Undo commits permanently::
+
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2007 03:28:37 UTC\r
+Last updated 07-Jan-2008 07:50:44 UTC\r
</div>\r
</div>\r
</body>\r
$ git-rev-list A...B
-----------------------------------------------------------------------
-gitlink:git-rev-list[1] is a very essential git program, since it
+linkgit:git-rev-list[1] is a very essential git program, since it
provides the ability to build and traverse commit ancestry graphs. For
this reason, it has a lot of different options that enables it to be
-used by commands as different as gitlink:git-bisect[1] and
-gitlink:git-repack[1].
+used by commands as different as linkgit:git-bisect[1] and
+linkgit:git-repack[1].
OPTIONS
-------
Commit Formatting
~~~~~~~~~~~~~~~~~
-Using these options, gitlink:git-rev-list[1] will act similar to the
-more specialized family of commit log tools: gitlink:git-log[1],
-gitlink:git-show[1], and gitlink:git-whatchanged[1]
+Using these options, linkgit:git-rev-list[1] will act similar to the
+more specialized family of commit log tools: linkgit:git-log[1],
+linkgit:git-show[1], and linkgit:git-whatchanged[1]
include::pretty-options.txt[]
~~~~~~~~~~~~~~~
Below are listed options that control the formatting of diff output.
-Some of them are specific to gitlink:git-rev-list[1], however other diff
-options may be given. See gitlink:git-diff-files[1] for more options.
+Some of them are specific to linkgit:git-rev-list[1], however other diff
+options may be given. See linkgit:git-diff-files[1] for more options.
-c::
Similar to '--objects', but also print the IDs of excluded
commits prefixed with a "-" character. This is used by
- gitlink:git-pack-objects[1] to build "thin" pack, which records
+ linkgit:git-pack-objects[1] to build "thin" pack, which records
objects in deltified form based on objects contained in these
excluded commits to reduce network traffic.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</p>\r
</dd>\r
<dt>\r
+--symbolic-full-name\r
+</dt>\r
+<dd>\r
+<p>\r
+ This is similar to --symbolic, but it omits input that\r
+ are not refs (i.e. branch or tag names; or more\r
+ explicitly disambiguating "heads/master" form, when you\r
+ want to name the "master" branch when there is an\r
+ unfortunately named tag "master"), and show them as full\r
+ refnames (e.g. "refs/heads/master").\r
+</p>\r
+</dd>\r
+<dt>\r
--all\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Nov-2007 05:02:45 UTC\r
+Last updated 07-Jan-2008 07:50:44 UTC\r
</div>\r
</div>\r
</body>\r
possible '{caret}' prefix); this option makes them output in a
form as close to the original input as possible.
+--symbolic-full-name::
+ This is similar to \--symbolic, but it omits input that
+ are not refs (i.e. branch or tag names; or more
+ explicitly disambiguating "heads/master" form, when you
+ want to name the "master" branch when there is an
+ unfortunately named tag "master"), and show them as full
+ refnames (e.g. "refs/heads/master").
--all::
Show all refs found in `$GIT_DIR/refs`.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:46 UTC\r
+Last updated 07-Jan-2008 07:50:43 UTC\r
</div>\r
</div>\r
</body>\r
<commit>::
Commit to revert.
For a more complete list of ways to spell commit names, see
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
-e|--edit::
With this option, `git-revert` will let you edit the commit
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:47 UTC\r
+Last updated 07-Jan-2008 07:50:46 UTC\r
</div>\r
</div>\r
</body>\r
See Also
--------
-gitlink:git-add[1]
+linkgit:git-add[1]
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Dec-2007 07:33:02 UTC\r
+Last updated 07-Jan-2008 07:50:46 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Dec-2007 10:59:14 UTC\r
+Last updated 07-Jan-2008 07:50:47 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
-Usually you would want to use gitlink:git-push[1] which is a
+Usually you would want to use linkgit:git-push[1] which is a
higher level wrapper of this command instead.
Invokes 'git-receive-pack' on a possibly remote repository, and
pushed is determined by finding a match that matches the source
side, and where it is pushed is determined by using the
destination side. The rules used to match a ref are the same
-rules used by gitlink:git-rev-parse[1] to resolve a symbolic ref
+rules used by linkgit:git-rev-parse[1] to resolve a symbolic ref
name.
- It is an error if <src> does not match exactly one of the
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Dec-2007 09:44:03 UTC\r
+Last updated 07-Jan-2008 07:50:50 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:48 UTC\r
+Last updated 07-Jan-2008 07:50:47 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Dec-2007 19:31:23 UTC\r
+Last updated 07-Jan-2008 07:50:47 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:49 UTC\r
+Last updated 07-Jan-2008 07:50:47 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:49 UTC\r
+Last updated 07-Jan-2008 07:50:48 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 18-Dec-2007 06:59:38 UTC\r
+Last updated 07-Jan-2008 07:50:49 UTC\r
</div>\r
</div>\r
</body>\r
will only match the exact branch called "master".
-If nothing matches, gitlink:git-show-ref[1] will return an error code of 1,
+If nothing matches, linkgit:git-show-ref[1] will return an error code of 1,
and in the case of verification, it will show an error message.
For scripting, you can ask it to be quiet with the "--quiet" flag, which
SEE ALSO
--------
-gitlink:git-ls-remote[1]
+linkgit:git-ls-remote[1]
AUTHORS
-------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Jan-2008 10:31:58 UTC\r
+Last updated 07-Jan-2008 07:50:48 UTC\r
</div>\r
</div>\r
</body>\r
For tags, it shows the tag message and the referenced objects.
-For trees, it shows the names (equivalent to gitlink:git-ls-tree[1]
+For trees, it shows the names (equivalent to linkgit:git-ls-tree[1]
with \--name-only).
For plain blobs, it shows the plain contents.
-The command takes options applicable to the gitlink:git-diff-tree[1] command to
+The command takes options applicable to the linkgit:git-diff-tree[1] command to
control how the changes the commit introduces are shown.
This manual page describes only the most frequently used options.
<object>::
The name of the object to show.
For a more complete list of ways to spell object names, see
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
include::pretty-options.txt[]
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:51 UTC\r
+Last updated 07-Jan-2008 07:50:50 UTC\r
</div>\r
</div>\r
</body>\r
SEE ALSO
--------
-gitlink:git-checkout[1],
-gitlink:git-commit[1],
-gitlink:git-reflog[1],
-gitlink:git-reset[1]
+linkgit:git-checkout[1],
+linkgit:git-commit[1],
+linkgit:git-reflog[1],
+linkgit:git-reset[1]
AUTHOR
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Dec-2007 10:07:20 UTC\r
+Last updated 07-Jan-2008 07:50:51 UTC\r
</div>\r
</div>\r
</body>\r
Displays paths that have differences between the index file and the
current HEAD commit, paths that have differences between the working
tree and the index file, and paths in the working tree that are not
-tracked by git (and are not ignored by gitlink:gitignore[5]). The first
+tracked by git (and are not ignored by linkgit:gitignore[5]). The first
are what you _would_ commit by running `git commit`; the second and
third are what you _could_ commit by running `git add` before running
`git commit`.
See Also
--------
-gitlink:gitignore[5]
+linkgit:gitignore[5]
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:53 UTC\r
+Last updated 07-Jan-2008 07:50:51 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Dec-2007 09:44:03 UTC\r
+Last updated 07-Jan-2008 07:50:51 UTC\r
</div>\r
</div>\r
</body>\r
status::
Show the status of the submodules. This will print the SHA-1 of the
currently checked out commit for each submodule, along with the
- submodule path and the output of gitlink:git-describe[1] for the
+ submodule path and the output of linkgit:git-describe[1] for the
SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
initialized and `+` if the currently checked out submodule commit
does not match the SHA-1 found in the index of the containing
When initializing submodules, a .gitmodules file in the top-level directory
of the containing repository is used to find the url of each submodule.
This file should be formatted in the same way as `$GIT_DIR/config`. The key
-to each submodule url is "submodule.$name.url". See gitlink:gitmodules[5]
+to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5]
for details.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Nov-2007 08:43:06 UTC\r
+Last updated 07-Jan-2008 07:50:52 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
git-svn is a simple conduit for changesets between Subversion and git.
-It is not to be confused with gitlink:git-svnimport[1], which is
+It is not to be confused with linkgit:git-svnimport[1], which is
read-only.
git-svn was originally designed for an individual developer who wants a
--shared[={false|true|umask|group|all|world|everybody}]::
--template=<template_directory>::
Only used with the 'init' command.
- These are passed directly to gitlink:git-init[1].
+ These are passed directly to linkgit:git-init[1].
-r <ARG>::
--revision <ARG>::
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
They are both passed directly to git-diff-tree see
-gitlink:git-diff-tree[1] for more information.
+linkgit:git-diff-tree[1] for more information.
[verse]
config key: svn.l
to fetch before repacking. This defaults to repacking every
1000 commits fetched if no argument is specified.
---repack-flags are passed directly to gitlink:git-repack[1].
+--repack-flags are passed directly to linkgit:git-repack[1].
[verse]
config key: svn.repack
independent path component (surrounded by '/' or EOL). This
type of configuration is not automatically created by 'init' and
should be manually entered with a text-editor or using
-gitlink:git-config[1]
+linkgit:git-config[1]
SEE ALSO
--------
-gitlink:git-rebase[1]
+linkgit:git-rebase[1]
Author
------
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:53 UTC\r
+Last updated 07-Jan-2008 07:50:52 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Dec-2007 18:56:08 UTC\r
+Last updated 07-Jan-2008 07:50:53 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:54 UTC\r
+Last updated 07-Jan-2008 07:50:54 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:05 UTC\r
+Last updated 07-Jan-2008 07:51:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:55 UTC\r
+Last updated 07-Jan-2008 07:50:54 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:55 UTC\r
+Last updated 07-Jan-2008 07:50:55 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:55 UTC\r
+Last updated 07-Jan-2008 07:50:55 UTC\r
</div>\r
</div>\r
</body>\r
into the index and any 'unmerged' or 'needs updating' state is
cleared.
-See also gitlink:git-add[1] for a more user-friendly way to do some of
+See also linkgit:git-add[1] for a more user-friendly way to do some of
the most common operations on the index.
The way "git-update-index" handles files it is told about can be modified
The command honors `core.filemode` configuration variable. If
your repository is on an filesystem whose executable bits are
-unreliable, this should be set to 'false' (see gitlink:git-config[1]).
+unreliable, this should be set to 'false' (see linkgit:git-config[1]).
This causes the command to ignore differences in file modes recorded
in the index and the file mode on the filesystem if they differ only on
executable bit. On such an unfortunate filesystem, you may
need to use `git-update-index --chmod=`.
Quite similarly, if `core.symlinks` configuration variable is set
-to 'false' (see gitlink:git-config[1]), symbolic links are checked out
+to 'false' (see linkgit:git-config[1]), symbolic links are checked out
as plain files, and this command does not modify a recorded file mode
from symbolic link to regular file.
See Also
--------
-gitlink:git-config[1],
-gitlink:git-add[1]
+linkgit:git-config[1],
+linkgit:git-add[1]
Author
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:55 UTC\r
+Last updated 07-Jan-2008 07:50:56 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:56 UTC\r
+Last updated 07-Jan-2008 07:50:57 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:56 UTC\r
+Last updated 07-Jan-2008 07:50:57 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:56 UTC\r
+Last updated 07-Jan-2008 07:50:57 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:56 UTC\r
+Last updated 07-Jan-2008 07:50:57 UTC\r
</div>\r
</div>\r
</body>\r
See Also
--------
-gitlink:git-commit-tree[1]
-gitlink:git-tag[1]
-gitlink:git-config[1]
+linkgit:git-commit-tree[1]
+linkgit:git-tag[1]
+linkgit:git-config[1]
Author
------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:56 UTC\r
+Last updated 07-Jan-2008 07:50:58 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:57 UTC\r
+Last updated 07-Jan-2008 07:50:58 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:57 UTC\r
+Last updated 07-Jan-2008 07:50:58 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:57 UTC\r
+Last updated 07-Jan-2008 07:50:59 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Dec-2007 07:33:03 UTC\r
+Last updated 07-Jan-2008 07:51:01 UTC\r
</div>\r
</div>\r
</body>\r
introduction.
The COMMAND is either a name of a Git command (see below) or an alias
-as defined in the configuration file (see gitlink:git-config[1]).
+as defined in the configuration file (see linkgit:git-config[1]).
Formatted and hyperlinked version of the latest git
documentation can be viewed at
option will bring up the manual page for that command.
+
Other options are available to control how the manual page is
-displayed. See gitlink:git-help[1] for more information,
+displayed. See linkgit:git-help[1] for more information,
because 'git --help ...' is converted internally into 'git
help ...'.
Although git includes its
own porcelain layer, its low-level commands are sufficient to support
development of alternative porcelains. Developers of such porcelains
-might start by reading about gitlink:git-update-index[1] and
-gitlink:git-read-tree[1].
+might start by reading about linkgit:git-update-index[1] and
+linkgit:git-read-tree[1].
The interface (input, output, set of options and the semantics)
to these low-level commands are meant to be a lot more stable
(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
For a more complete list of ways to spell object names, see
-"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
File/Directory Structure
'GIT_COMMITTER_EMAIL'::
'GIT_COMMITTER_DATE'::
'EMAIL'::
- see gitlink:git-commit-tree[1]
+ see linkgit:git-commit-tree[1]
git Diffs
~~~~~~~~~
'GIT_MERGE_VERBOSITY'::
A number controlling the amount of output shown by
the recursive merge strategy. Overrides merge.verbosity.
- See gitlink:git-merge[1]
+ See linkgit:git-merge[1]
'GIT_PAGER'::
This environment variable overrides `$PAGER`. If it is set
a pager.
'GIT_SSH'::
- If this environment variable is set then gitlink:git-fetch[1]
- and gitlink:git-push[1] will use this command instead
+ If this environment variable is set then linkgit:git-fetch[1]
+ and linkgit:git-push[1] will use this command instead
of `ssh` when they need to connect to a remote system.
The 'GIT_SSH' command will be given exactly two arguments:
the 'username@host' (or just 'host') from the URL and the
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Dec-2007 08:15:27 UTC\r
+Last updated 07-Jan-2008 07:50:59 UTC\r
</div>\r
</div>\r
</body>\r
attribute set to `jcdiff`, it calls the command you specified
with the above configuration, i.e. `j-c-diff`, with 7
parameters, just like `GIT_EXTERNAL_DIFF` program is called.
-See gitlink:git[7] for details.
+See linkgit:git[7] for details.
Defining a custom hunk-header
The `core.whitespace` configuration variable allows you to define what
`diff` and `apply` should consider whitespace errors for all paths in
-the project (See gitlink:git-config[1]). This attribute gives you finer
+the project (See linkgit:git-config[1]). This attribute gives you finer
control per path.
Set::
If the attribute `export-subst` is set for a file then git will expand
several placeholders when adding this file to an archive. The
expansion depends on the availability of a commit ID, i.e. if
-gitlink:git-archive[1] has been given a tree instead of a commit or a
+linkgit:git-archive[1] has been given a tree instead of a commit or a
tag then no replacement will be done. The placeholders are the same
-as those for the option `--pretty=format:` of gitlink:git-log[1],
+as those for the option `--pretty=format:` of linkgit:git-log[1],
except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
in the file. E.g. the string `$Format:%H$` will be replaced by the
commit hash.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Dec-2007 08:15:28 UTC\r
+Last updated 07-Jan-2008 07:51:00 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:58 UTC\r
+Last updated 07-Jan-2008 07:51:00 UTC\r
</div>\r
</div>\r
</body>\r
variable 'core.excludesfile'.
The underlying git plumbing tools, such as
-gitlink:git-ls-files[1] and gitlink:git-read-tree[1], read
+linkgit:git-ls-files[1] and linkgit:git-read-tree[1], read
`gitignore` patterns specified by command-line options, or from
files specified by command-line options. Higher-level git
-tools, such as gitlink:git-status[1] and gitlink:git-add[1],
+tools, such as linkgit:git-status[1] and linkgit:git-add[1],
use patterns from the sources specified above.
Patterns have the following format:
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:57 UTC\r
+Last updated 07-Jan-2008 07:50:59 UTC\r
</div>\r
</div>\r
</body>\r
OPTIONS
-------
To control which revisions to shown, the command takes options applicable to
-the gitlink:git-rev-list[1] command. This manual page describes only the most
+the linkgit:git-rev-list[1] command. This manual page describes only the most
frequently used options.
-n <number>, --max-count=<number>::
the form "'<from>'..'<to>'" to show all revisions between '<from>' and
back to '<to>'. Note, more advanced revision selection can be applied.
For a more complete list of ways to spell object names, see
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
<path>::
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:58 UTC\r
+Last updated 07-Jan-2008 07:51:01 UTC\r
</div>\r
</div>\r
</body>\r
The `.gitmodules` file, located in the top-level directory of a git
working tree, is a text file with a syntax matching the requirements
-of gitlink:git-config[1].
+of linkgit:git-config[1].
The file contains one subsection per submodule, and the subsection value
is the name of the submodule. Each submodule section also contains the
SEE ALSO
--------
-gitlink:git-submodule[1] gitlink:git-config[1]
+linkgit:git-submodule[1] linkgit:git-config[1]
DOCUMENTATION
-------------
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-Dec-2007 21:33:10 UTC\r
+Last updated 07-Jan-2008 07:51:14 UTC\r
</div>\r
</div>\r
</body>\r
branch's <<def_head_ref,head ref>> from a remote
<<def_repository,repository>>, to find out which objects are
missing from the local <<def_object_database,object database>>,
- and to get them, too. See also gitlink:git-fetch[1].
+ and to get them, too. See also linkgit:git-fetch[1].
[[def_file_system]]file system::
Linus Torvalds originally designed git to be a user space file system,
A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a
<<def_branch,branch>>. Heads are stored in
`$GIT_DIR/refs/heads/`, except when using packed refs. (See
- gitlink:git-pack-refs[1].)
+ linkgit:git-pack-refs[1].)
[[def_HEAD]]HEAD::
The current <<def_branch,branch>>. In more detail: Your <<def_working_tree,
routines that help select changes that add or delete a given text
string. With the `--pickaxe-all` option, it can be used to view the full
<<def_changeset,changeset>> that introduced or removed, say, a
- particular line of text. See gitlink:git-diff[1].
+ particular line of text. See linkgit:git-diff[1].
[[def_plumbing]]plumbing::
Cute name for <<def_core_git,core git>>.
[[def_pull]]pull::
Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and
- <<def_merge,merge>> it. See also gitlink:git-pull[1].
+ <<def_merge,merge>> it. See also linkgit:git-pull[1].
[[def_push]]push::
Pushing a <<def_branch,branch>> means to get the branch's
A reflog shows the local "history" of a ref. In other words,
it can tell you what the 3rd last revision in _this_ repository
was, and what was the current state in _this_ repository,
- yesterday 9:14pm. See gitlink:git-reflog[1] for details.
+ yesterday 9:14pm. See linkgit:git-reflog[1] for details.
[[def_refspec]]refspec::
A "refspec" is used by <<def_fetch,fetch>> and
it as my origin branch head". And `git push
$URL refs/heads/master:refs/heads/to-upstream` means "publish my
master branch head as to-upstream branch at $URL". See also
- gitlink:git-push[1].
+ linkgit:git-push[1].
[[def_repository]]repository::
A collection of <<def_ref,refs>> together with an
object>>). This is sometimes useful when you are interested only in the
recent history of a project even though the real history recorded in the
upstream is much larger. A shallow repository
- is created by giving the `--depth` option to gitlink:git-clone[1], and
- its history can be later deepened with gitlink:git-fetch[1].
+ is created by giving the `--depth` option to linkgit:git-clone[1], and
+ its history can be later deepened with linkgit:git-fetch[1].
[[def_symref]]symref::
Symbolic reference: instead of containing the <<def_SHA1,SHA1>>
id itself, it is of the format 'ref: refs/some/thing' and when
referenced, it recursively dereferences to this reference.
'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic
- references are manipulated with the gitlink:git-symbolic-ref[1]
+ references are manipulated with the linkgit:git-symbolic-ref[1]
command.
[[def_tag]]tag::
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:04 UTC\r
+Last updated 07-Jan-2008 07:51:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Nov-2007 08:43:05 UTC\r
+Last updated 07-Jan-2008 07:51:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:06 UTC\r
+Last updated 07-Jan-2008 07:51:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:03 UTC\r
+Last updated 07-Jan-2008 07:51:11 UTC\r
</div>\r
</div>\r
</body>\r
incomplete object store is not suitable to be published to the
outside world but sometimes useful for private repository.
. You also could have an incomplete but locally usable repository
-by cloning shallowly. See gitlink:git-clone[1].
+by cloning shallowly. See linkgit:git-clone[1].
. You can be using `objects/info/alternates` mechanism, or
`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
objects from other object stores. A repository with this kind
packed-refs::
records the same information as refs/heads/, refs/tags/,
and friends record in a more efficient way. See
- gitlink:git-pack-refs[1].
+ linkgit:git-pack-refs[1].
HEAD::
A symref (see glossary) to the `refs/heads/` namespace
HEAD can also record a specific commit directly, instead of
being a symref to point at the current branch. Such a state
is often called 'detached HEAD', and almost all commands work
-identically as normal. See gitlink:git-checkout[1] for
+identically as normal. See linkgit:git-checkout[1] for
details.
branches::
exclude pattern list. `.gitignore` is the per-directory
ignore file. `git status`, `git add`, `git rm` and `git
clean` look at it but the core git commands do not look
- at it. See also: gitlink:gitignore[5].
+ at it. See also: linkgit:gitignore[5].
remotes::
Stores shorthands to be used to give URL and default
shallow::
This is similar to `info/grafts` but is internally used
and maintained by shallow clone mechanism. See `--depth`
- option to gitlink:git-clone[1] and gitlink:git-fetch[1].
+ option to linkgit:git-clone[1] and linkgit:git-fetch[1].
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:57 UTC\r
+Last updated 07-Jan-2008 07:51:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:58 UTC\r
+Last updated 07-Jan-2008 07:51:18 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:58 UTC\r
+Last updated 07-Jan-2008 07:51:19 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:58 UTC\r
+Last updated 07-Jan-2008 07:51:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:59 UTC\r
+Last updated 07-Jan-2008 07:51:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:59 UTC\r
+Last updated 07-Jan-2008 07:51:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:59 UTC\r
+Last updated 07-Jan-2008 07:51:25 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:59 UTC\r
+Last updated 07-Jan-2008 07:51:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:59 UTC\r
+Last updated 07-Jan-2008 07:51:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:02 UTC\r
+Last updated 07-Jan-2008 07:51:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:00 UTC\r
+Last updated 07-Jan-2008 07:51:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:00 UTC\r
+Last updated 07-Jan-2008 07:51:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:00 UTC\r
+Last updated 07-Jan-2008 07:51:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:00 UTC\r
+Last updated 07-Jan-2008 07:51:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:00 UTC\r
+Last updated 07-Jan-2008 07:51:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:01 UTC\r
+Last updated 07-Jan-2008 07:51:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:01 UTC\r
+Last updated 07-Jan-2008 07:51:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:01 UTC\r
+Last updated 07-Jan-2008 07:51:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:01 UTC\r
+Last updated 07-Jan-2008 07:51:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:01 UTC\r
+Last updated 07-Jan-2008 07:51:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:40:01 UTC\r
+Last updated 07-Jan-2008 07:51:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:00 UTC\r
+Last updated 07-Jan-2008 07:51:03 UTC\r
</div>\r
</div>\r
</body>\r
branches.
Besides blobs, trees, and commits, the only remaining type of object
-is a "tag", which we won't discuss here; refer to gitlink:git-tag[1]
+is a "tag", which we won't discuss here; refer to linkgit:git-tag[1]
for details.
So now we know how git uses the object database to represent a
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:59 UTC\r
+Last updated 07-Jan-2008 07:51:01 UTC\r
</div>\r
</div>\r
</body>\r
directory created, named ".git".
Next, tell git to take a snapshot of the contents of all files under the
-current directory (note the '.'), with gitlink:git-add[1]:
+current directory (note the '.'), with linkgit:git-add[1]:
------------------------------------------------
$ git add .
This snapshot is now stored in a temporary staging area which git calls
the "index". You can permanently store the contents of the index in the
-repository with gitlink:git-commit[1]:
+repository with linkgit:git-commit[1]:
------------------------------------------------
$ git commit
------------------------------------------------
You are now ready to commit. You can see what is about to be committed
-using gitlink:git-diff[1] with the --cached option:
+using linkgit:git-diff[1] with the --cached option:
------------------------------------------------
$ git diff --cached
------------------------------------------------
-(Without --cached, gitlink:git-diff[1] will show you any changes that
+(Without --cached, linkgit:git-diff[1] will show you any changes that
you've made but not yet added to the index.) You can also get a brief
-summary of the situation with gitlink:git-status[1]:
+summary of the situation with linkgit:git-status[1]:
------------------------------------------------
$ git status
-------------------------------------
(The complete configuration created by git-clone is visible using
-"git config -l", and the gitlink:git-config[1] man page
+"git config -l", and the linkgit:git-config[1] man page
explains the meaning of each option.)
Git also keeps a pristine copy of Alice's master branch under the
-------------------------------------
Alternatively, git has a native protocol, or can use rsync or http;
-see gitlink:git-pull[1] for details.
+see linkgit:git-pull[1] for details.
Git can also be used in a CVS-like mode, with a central repository
-that various users push changes to; see gitlink:git-push[1] and
+that various users push changes to; see linkgit:git-push[1] and
link:cvs-migration.html[git for CVS users].
Exploring history
you can refer to 1b2e1d63ff by the name "v2.5". If you intend to
share this name with other people (for example, to identify a release
version), you should create a "tag" object, and perhaps sign it; see
-gitlink:git-tag[1] for details.
+linkgit:git-tag[1] for details.
Any git command that needs to know a commit can take any of these
names. For example:
commits, they will be lost. Also, don't use "git reset" on a
publicly-visible branch that other developers pull from, as it will
force needless merges on other developers to clean up the history.
-If you need to undo changes that you have pushed, use gitlink:git-revert[1]
+If you need to undo changes that you have pushed, use linkgit:git-revert[1]
instead.
The git grep command can search for strings in any version of your
If you don't want to continue with that right away, a few other
digressions that may be interesting at this point are:
- * gitlink:git-format-patch[1], gitlink:git-am[1]: These convert
+ * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
series of git commits into emailed patches, and vice versa,
useful for projects such as the linux kernel which rely heavily
on emailed patches.
- * gitlink:git-bisect[1]: When there is a regression in your
+ * linkgit:git-bisect[1]: When there is a regression in your
project, one way to track down the bug is by searching through
the history to find the exact commit that's to blame. Git bisect
can help you perform a binary search for that commit. It is
ifndef::git-clone[]
They are mostly equivalent, except when cloning. See
-gitlink:git-clone[1] for details.
+linkgit:git-clone[1] for details.
endif::git-clone[]
ifdef::git-clone[]
It will be useful to have a git repository to experiment with as you
read this manual.
-The best way to get one is by using the gitlink:git-clone[1] command to
+The best way to get one is by using the linkgit:git-clone[1] command to
download a copy of an existing repository. If you don't already have a
project in mind, here are some interesting examples:
A single git repository can track development on multiple branches. It
does this by keeping a list of <<def_head,heads>> which reference the
-latest commit on each branch; the gitlink:git-branch[1] command shows
+latest commit on each branch; the linkgit:git-branch[1] command shows
you the list of branch heads:
------------------------------------------------
Most projects also use <<def_tag,tags>>. Tags, like heads, are
references into the project's history, and can be listed using the
-gitlink:git-tag[1] command:
+linkgit:git-tag[1] command:
------------------------------------------------
$ git tag -l
while heads are expected to advance as development progresses.
Create a new branch head pointing to one of these versions and check it
-out using gitlink:git-checkout[1]:
+out using linkgit:git-checkout[1]:
------------------------------------------------
$ git checkout -b new v2.6.13
------------------------------------------------
The working directory then reflects the contents that the project had
-when it was tagged v2.6.13, and gitlink:git-branch[1] shows two
+when it was tagged v2.6.13, and linkgit:git-branch[1] shows two
branches, with an asterisk marking the currently checked-out branch:
------------------------------------------------
------------------------------
Every change in the history of a project is represented by a commit.
-The gitlink:git-show[1] command shows the most recent commit on the
+The linkgit:git-show[1] command shows the most recent commit on the
current branch:
------------------------------------------------
each parent representing the most recent commit on one of the lines
of development leading to that point.
-The best way to see how this works is using the gitlink:gitk[1]
+The best way to see how this works is using the linkgit:gitk[1]
command; running gitk now on a git repository and looking for merge
commits will help understand how the git organizes history.
of the HEAD in the repository that you cloned from. That repository
may also have had other branches, though, and your local repository
keeps branches which track each of those remote branches, which you
-can view using the "-r" option to gitlink:git-branch[1]:
+can view using the "-r" option to linkgit:git-branch[1]:
------------------------------------------------
$ git branch -r
(Newly created refs are actually stored in the .git/refs directory,
under the path given by their name. However, for efficiency reasons
they may also be packed together in a single file; see
-gitlink:git-pack-refs[1]).
+linkgit:git-pack-refs[1]).
As another useful shortcut, the "HEAD" of a repository can be referred
to just using the name of that repository. So, for example, "origin"
For the complete list of paths which git checks for references, and
the order it uses to decide which to choose when there are multiple
references with the same shorthand name, see the "SPECIFYING
-REVISIONS" section of gitlink:git-rev-parse[1].
+REVISIONS" section of linkgit:git-rev-parse[1].
[[Updating-a-repository-with-git-fetch]]
Updating a repository with git fetch
-----------------------------------------
You can also track branches from repositories other than the one you
-cloned from, using gitlink:git-remote[1]:
+cloned from, using linkgit:git-remote[1]:
-------------------------------------------------
$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
This is what causes git to track the remote's branches; you may modify
or delete these configuration options by editing .git/config with a
text editor. (See the "CONFIGURATION FILE" section of
-gitlink:git-config[1] for details.)
+linkgit:git-config[1] for details.)
[[exploring-git-history]]
Exploring git history
"master" crashes. Sometimes the best way to find the cause of such a
regression is to perform a brute-force search through the project's
history to find the particular commit that caused the problem. The
-gitlink:git-bisect[1] command can help you do this:
+linkgit:git-bisect[1] command can help you do this:
-------------------------------------------------
$ git bisect start
After about 13 tests (in this case), it will output the commit id of
the guilty commit. You can then examine the commit with
-gitlink:git-show[1], find out who wrote it, and mail them your bug
+linkgit:git-show[1], find out who wrote it, and mail them your bug
report with the commit id. Finally, run
-------------------------------------------------
- HEAD: refers to the head of the current branch
There are many more; see the "SPECIFYING REVISIONS" section of the
-gitlink:git-rev-parse[1] man page for the complete list of ways to
+linkgit:git-rev-parse[1] man page for the complete list of ways to
name revisions. Some examples:
-------------------------------------------------
which refers to the other branch that we're merging in to the current
branch.
-The gitlink:git-rev-parse[1] command is a low-level command that is
+The linkgit:git-rev-parse[1] command is a low-level command that is
occasionally useful for translating some name for a commit to the object
name for that commit:
This creates a "lightweight" tag. If you would also like to include a
comment with the tag, and possibly sign it cryptographically, then you
-should create a tag object instead; see the gitlink:git-tag[1] man page
+should create a tag object instead; see the linkgit:git-tag[1] man page
for details.
[[browsing-revisions]]
Browsing revisions
------------------
-The gitlink:git-log[1] command can show lists of commits. On its
+The linkgit:git-log[1] command can show lists of commits. On its
own, it shows all commits reachable from the parent commit; but you
can also make more specific requests:
$ git log -p
-------------------------------------------------
-See the "--pretty" option in the gitlink:git-log[1] man page for more
+See the "--pretty" option in the linkgit:git-log[1] man page for more
display options.
Note that git log starts with the most recent commit and works
----------------
You can generate diffs between any two versions using
-gitlink:git-diff[1]:
+linkgit:git-diff[1]:
-------------------------------------------------
$ git diff master..test
-------------------------------------------------
Sometimes what you want instead is a set of patches; for this you can
-use gitlink:git-format-patch[1]:
+use linkgit:git-format-patch[1]:
-------------------------------------------------
$ git format-patch master..test
-------------------------------------------------
Alternatively, you may often see this sort of thing done with the
-lower-level command gitlink:git-rev-list[1], which just lists the SHA1's
+lower-level command linkgit:git-rev-list[1], which just lists the SHA1's
of all the given commits:
-------------------------------------------------
$ gitk e05db0fd..
-------------------------------------------------
-Or you can use gitlink:git-name-rev[1], which will give the commit a
+Or you can use linkgit:git-name-rev[1], which will give the commit a
name based on any tag it finds pointing to one of the commit's
descendants:
e05db0fd tags/v1.5.0-rc1^0~23
-------------------------------------------------
-The gitlink:git-describe[1] command does the opposite, naming the
+The linkgit:git-describe[1] command does the opposite, naming the
revision using a tag on which the given commit is based:
-------------------------------------------------
given commit.
If you just want to verify whether a given tagged version contains a
-given commit, you could use gitlink:git-merge-base[1]:
+given commit, you could use linkgit:git-merge-base[1]:
-------------------------------------------------
$ git merge-base e05db0fd v1.5.0-rc1
will produce empty output if and only if v1.5.0-rc1 includes e05db0fd,
because it outputs only commits that are not reachable from v1.5.0-rc1.
-As yet another alternative, the gitlink:git-show-branch[1] command lists
+As yet another alternative, the linkgit:git-show-branch[1] command lists
the commits reachable from its arguments with a display on the left-hand
side that indicates which arguments that commit is reachable from. So,
you can run something like
head named "master" but not from any other head in your repository.
We can list all the heads in this repository with
-gitlink:git-show-ref[1]:
+linkgit:git-show-ref[1]:
-------------------------------------------------
$ git show-ref --heads
$ gitk $( git show-ref --heads ) --not $( git show-ref --tags )
-------------------------------------------------
-(See gitlink:git-rev-parse[1] for explanations of commit-selecting
+(See linkgit:git-rev-parse[1] for explanations of commit-selecting
syntax such as `--not`.)
[[making-a-release]]
Creating a changelog and tarball for a software release
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The gitlink:git-archive[1] command can create a tar or zip archive from
+The linkgit:git-archive[1] command can create a tar or zip archive from
any version of a project; for example:
-------------------------------------------------
-------------------------------------------------
Figuring out why this works is left as an exercise to the (advanced)
-student. The gitlink:git-log[1], gitlink:git-diff-tree[1], and
-gitlink:git-hash-object[1] man pages may prove helpful.
+student. The linkgit:git-log[1], linkgit:git-diff-tree[1], and
+linkgit:git-hash-object[1] man pages may prove helpful.
[[Developing-with-git]]
Developing with git
email = you@yourdomain.example.com
------------------------------------------------
-(See the "CONFIGURATION FILE" section of gitlink:git-config[1] for
+(See the "CONFIGURATION FILE" section of linkgit:git-config[1] for
details on the configuration file.)
$ git status # a brief per-file summary of the above.
-------------------------------------------------
-You can also use gitlink:git-gui[1] to create commits, view changes in
+You can also use linkgit:git-gui[1] to create commits, view changes in
the index and the working tree files, and individually select diff hunks
for inclusion in the index (by right-clicking on the diff hunk and
choosing "Stage Hunk For Commit").
*.[oa]
-------------------------------------------------
-See gitlink:gitignore[5] for a detailed explanation of the syntax. You can
+See linkgit:gitignore[5] for a detailed explanation of the syntax. You can
also place .gitignore files in other directories in your working tree, and they
will apply to those directories and their subdirectories. The `.gitignore`
files can be added to your repository like any other files (just run `git add
them in a file in your repository named .git/info/exclude, or in any file
specified by the `core.excludesfile` configuration variable. Some git
commands can also take exclude patterns directly on the command line.
-See gitlink:gitignore[5] for the details.
+See linkgit:gitignore[5] for the details.
[[how-to-merge]]
How to merge
------------
You can rejoin two diverging branches of development using
-gitlink:git-merge[1]:
+linkgit:git-merge[1]:
-------------------------------------------------
$ git merge branchname
information you need to help resolve the merge.
Files with conflicts are marked specially in the index, so until you
-resolve the problem and update the index, gitlink:git-commit[1] will
+resolve the problem and update the index, linkgit:git-commit[1] will
fail:
-------------------------------------------------
file.txt: needs merge
-------------------------------------------------
-Also, gitlink:git-status[1] will list those files as "unmerged", and the
+Also, linkgit:git-status[1] will list those files as "unmerged", and the
files with conflicts will have conflict markers added, like this:
-------------------------------------------------
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
All of the changes that git was able to merge automatically are
-already added to the index file, so gitlink:git-diff[1] shows only
+already added to the index file, so linkgit:git-diff[1] shows only
the conflicts. It uses an unusual syntax:
-------------------------------------------------
Since the stage 2 and stage 3 versions have already been updated with
nonconflicting changes, the only remaining differences between them are
-the important ones; thus gitlink:git-diff[1] can use the information in
+the important ones; thus linkgit:git-diff[1] can use the information in
the index to show only those conflicts.
The diff above shows the differences between the working-tree version of
column is used for differences between the first parent and the working
directory copy, and the second for differences between the second parent
and the working directory copy. (See the "COMBINED DIFF FORMAT" section
-of gitlink:git-diff-files[1] for a details of the format.)
+of linkgit:git-diff-files[1] for a details of the format.)
After resolving the conflict in the obvious way (but before updating the
index), the diff will look like:
$ git diff --theirs file.txt # same as the above.
-------------------------------------------------
-The gitlink:git-log[1] and gitk[1] commands also provide special help
+The linkgit:git-log[1] and gitk[1] commands also provide special help
for merges:
-------------------------------------------------
These will display all commits which exist only on HEAD or on
MERGE_HEAD, and which touch an unmerged file.
-You may also use gitlink:git-mergetool[1], which lets you merge the
+You may also use linkgit:git-mergetool[1], which lets you merge the
unmerged files using external tools such as emacs or kdiff3.
Each time you resolve the conflicts in a file and update the index:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Creating a new commit that reverts an earlier change is very easy;
-just pass the gitlink:git-revert[1] command a reference to the bad
+just pass the linkgit:git-revert[1] command a reference to the bad
commit; for example, to revert the most recent commit:
-------------------------------------------------
changes, giving you a chance to edit the old commit message first.
Again, you should never do this to a commit that may already have
-been merged into another branch; use gitlink:git-revert[1] instead in
+been merged into another branch; use linkgit:git-revert[1] instead in
that case.
It is also possible to replace commits further back in the history, but
In the process of undoing a previous bad change, you may find it
useful to check out an older version of a particular file using
-gitlink:git-checkout[1]. We've used git checkout before to switch
+linkgit:git-checkout[1]. We've used git checkout before to switch
branches, but it has quite different behavior if it is given a path
name: the command
If you just want to look at an old version of the file, without
modifying the working directory, you can do that with
-gitlink:git-show[1]:
+linkgit:git-show[1]:
-------------------------------------------------
$ git show HEAD^:path/to/file
While you are in the middle of working on something complicated, you
find an unrelated but obvious and trivial bug. You would like to fix it
-before continuing. You can use gitlink:git-stash[1] to save the current
+before continuing. You can use linkgit:git-stash[1] to save the current
state of your work, and after fixing the bug (or, optionally after doing
so on a different branch and then coming back), unstash the
work-in-progress changes.
information from taking up too much space on disk or in memory.
This compression is not performed automatically. Therefore you
-should occasionally run gitlink:git-gc[1]:
+should occasionally run linkgit:git-gc[1]:
-------------------------------------------------
$ git gc
Checking the repository for corruption
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The gitlink:git-fsck[1] command runs a number of self-consistency checks
+The linkgit:git-fsck[1] command runs a number of self-consistency checks
on the repository, and reports on any problems. This may take some
time. The most common warning by far is about "dangling" objects:
Dangling objects are not a problem. At worst they may take up a little
extra disk space. They can sometimes provide a last-resort method for
recovering lost work--see <<dangling-objects>> for details. However, if
-you wish, you can remove them with gitlink:git-prune[1] or the `--prune`
-option to gitlink:git-gc[1]:
+you wish, you can remove them with linkgit:git-prune[1] or the `--prune`
+option to linkgit:git-gc[1]:
-------------------------------------------------
$ git gc --prune
git-gc when run without any options), it is not safe to prune while
other git operations are in progress in the same repository.
-If gitlink:git-fsck[1] complains about sha1 mismatches or missing
+If linkgit:git-fsck[1] complains about sha1 mismatches or missing
objects, you may have a much more serious problem; your best option is
probably restoring from backups. See
<<recovering-from-repository-corruption>> for a detailed discussion.
Reflogs
^^^^^^^
-Say you modify a branch with `gitlink:git-reset[1] --hard`, and then
+Say you modify a branch with `linkgit:git-reset[1] --hard`, and then
realize that the branch was the only reference you had to that point in
history.
you've checked out.
The reflogs are kept by default for 30 days, after which they may be
-pruned. See gitlink:git-reflog[1] and gitlink:git-gc[1] to learn
+pruned. See linkgit:git-reflog[1] and linkgit:git-gc[1] to learn
how to control this pruning, and see the "SPECIFYING REVISIONS"
-section of gitlink:git-rev-parse[1] for details.
+section of linkgit:git-rev-parse[1] for details.
Note that the reflog history is very different from normal git history.
While normal history is shared by every repository that works on the
into your own work.
We have already seen <<Updating-a-repository-with-git-fetch,how to
-keep remote tracking branches up to date>> with gitlink:git-fetch[1],
+keep remote tracking branches up to date>> with linkgit:git-fetch[1],
and how to merge two branches. So you can merge in changes from the
original repository's master branch with:
$ git merge origin/master
-------------------------------------------------
-However, the gitlink:git-pull[1] command provides a way to do this in
+However, the linkgit:git-pull[1] command provides a way to do this in
one step:
-------------------------------------------------
More generally, a branch that is created from a remote branch will pull
by default from that branch. See the descriptions of the
branch.<name>.remote and branch.<name>.merge options in
-gitlink:git-config[1], and the discussion of the `--track` option in
-gitlink:git-checkout[1], to learn how to control these defaults.
+linkgit:git-config[1], and the discussion of the `--track` option in
+linkgit:git-checkout[1], to learn how to control these defaults.
In addition to saving you keystrokes, "git pull" also helps you by
producing a default commit message documenting the branch and
If you just have a few changes, the simplest way to submit them may
just be to send them as patches in email:
-First, use gitlink:git-format-patch[1]; for example:
+First, use linkgit:git-format-patch[1]; for example:
-------------------------------------------------
$ git format-patch origin
You can then import these into your mail client and send them by
hand. However, if you have a lot to send at once, you may prefer to
-use the gitlink:git-send-email[1] script to automate the process.
+use the linkgit:git-send-email[1] script to automate the process.
Consult the mailing list for your project first to determine how they
prefer such patches be handled.
Importing patches to a project
------------------------------
-Git also provides a tool called gitlink:git-am[1] (am stands for
+Git also provides a tool called linkgit:git-am[1] (am stands for
"apply mailbox"), for importing such an emailed series of patches.
Just save all of the patch-containing messages, in order, into a
single mailbox file, say "patches.mbox", then run
Another way to submit changes to a project is to tell the maintainer
of that project to pull the changes from your repository using
-gitlink:git-pull[1]. In the section "<<getting-updates-with-git-pull,
+linkgit:git-pull[1]. In the section "<<getting-updates-with-git-pull,
Getting updates with git pull>>" we described this as a way to get
updates from the "main" repository, but it works just as well in the
other direction.
"<<pushing-changes-to-a-public-repository,Pushing changes to a public
repository>>", below.
-Otherwise, all you need to do is start gitlink:git-daemon[1]; it will
+Otherwise, all you need to do is start linkgit:git-daemon[1]; it will
listen on port 9418. By default, it will allow access to any directory
that looks like a git directory and contains the magic file
git-daemon-export-ok. Passing some directory paths as git-daemon
arguments will further restrict the exports to those paths.
You can also run git-daemon as an inetd service; see the
-gitlink:git-daemon[1] man page for details. (See especially the
+linkgit:git-daemon[1] man page for details. (See especially the
examples section.)
[[exporting-via-http]]
-------------------------------------------------
(For an explanation of the last two lines, see
-gitlink:git-update-server-info[1], and the documentation
+linkgit:git-update-server-info[1], and the documentation
link:hooks.html[Hooks used by git].)
Advertise the URL of proj.git. Anybody else should then be able to
access, which you will need to update the public repository with the
latest changes created in your private repository.
-The simplest way to do this is using gitlink:git-push[1] and ssh; to
+The simplest way to do this is using linkgit:git-push[1] and ssh; to
update the remote branch named "master" with the latest state of your
branch named "master", run
-------------------------------------------------
See the explanations of the remote.<name>.url, branch.<name>.remote,
-and remote.<name>.push options in gitlink:git-config[1] for
+and remote.<name>.push options in linkgit:git-config[1] for
details.
[[forcing-push]]
-------------------------------------------------
Linus's tree will be stored in the remote branch named origin/master,
-and can be updated using gitlink:git-fetch[1]; you can track other
-public trees using gitlink:git-remote[1] to set up a "remote" and
-gitlink:git-fetch[1] to keep them up-to-date; see
+and can be updated using linkgit:git-fetch[1]; you can track other
+public trees using linkgit:git-remote[1] to set up a "remote" and
+linkgit:git-fetch[1] to keep them up-to-date; see
<<repositories-and-branches>>.
Now create the branches in which you are going to work; these start out
at the current tip of origin/master branch, and should be set up (using
-the --track option to gitlink:git-branch[1]) to merge changes in from
+the --track option to linkgit:git-branch[1]) to merge changes in from
Linus by default.
-------------------------------------------------
$ git branch --track release origin/master
-------------------------------------------------
-These can be easily kept up to date using gitlink:git-pull[1].
+These can be easily kept up to date using linkgit:git-pull[1].
-------------------------------------------------
$ git checkout test && git pull
will become part of the permanent history when you ask Linus to pull
from the release branch.
-A few configuration variables (see gitlink:git-config[1]) can
+A few configuration variables (see linkgit:git-config[1]) can
make it easy to push both branches to your public tree. (See
<<setting-up-a-public-repository>>.)
-------------------------------------------------
Then you can push both the test and release trees using
-gitlink:git-push[1]:
+linkgit:git-push[1]:
-------------------------------------------------
$ git push mytree
However, if you prefer to keep the history in mywork a simple series of
commits without any merges, you may instead choose to use
-gitlink:git-rebase[1]:
+linkgit:git-rebase[1]:
-------------------------------------------------
$ git checkout mywork
which will replace the old commit by a new commit incorporating your
changes, giving you a chance to edit the old commit message first.
-You can also use a combination of this and gitlink:git-rebase[1] to
+You can also use a combination of this and linkgit:git-rebase[1] to
replace a commit further back in your history and recreate the
intervening changes on top of it. First, tag the problematic commit
with
Reordering or selecting from a patch series
-------------------------------------------
-Given one existing commit, the gitlink:git-cherry-pick[1] command
+Given one existing commit, the linkgit:git-cherry-pick[1] command
allows you to apply the change introduced by that commit and create a
new commit that records it. So, for example, if "mywork" points to a
series of patches on top of "origin", you might do something like:
and browse through the list of patches in the mywork branch using gitk,
applying them (possibly in a different order) to mywork-new using
cherry-pick, and possibly modifying them as you go using `commit --amend`.
-The gitlink:git-gui[1] command may also help as it allows you to
+The linkgit:git-gui[1] command may also help as it allows you to
individually select diff hunks for inclusion in the index (by
right-clicking on the diff hunk and choosing "Stage Hunk for Commit").
-------------------------------------------------
Then modify, reorder, or eliminate patches as preferred before applying
-them again with gitlink:git-am[1].
+them again with linkgit:git-am[1].
[[patch-series-tools]]
Other tools
Why bisecting merge commits can be harder than bisecting linear history
-----------------------------------------------------------------------
-The gitlink:git-bisect[1] command correctly handles history that
+The linkgit:git-bisect[1] command correctly handles history that
includes merge commits. However, when the commit that it finds is a
merge commit, the user may need to work harder than usual to figure out
why that commit introduced a problem.
on the lower line of development have not been converted to the new
semantics introduced on the upper line of development. So if all
you know is that D is bad, that Z is good, and that
-gitlink:git-bisect[1] identifies C as the culprit, how will you
+linkgit:git-bisect[1] identifies C as the culprit, how will you
figure out that the problem is due to this change in semantics?
When the result of a git-bisect is a non-merge commit, you should
Fetching individual branches
----------------------------
-Instead of using gitlink:git-remote[1], you can also choose just
+Instead of using linkgit:git-remote[1], you can also choose just
to update one branch at a time, and to store it locally under an
arbitrary name:
We saw above that "origin" is just a shortcut to refer to the
repository that you originally cloned from. This information is
stored in git configuration variables, which you can see using
-gitlink:git-config[1]:
+linkgit:git-config[1]:
-------------------------------------------------
$ git config -l
Also note that all of the above configuration can be performed by
directly editing the file .git/config instead of using
-gitlink:git-config[1].
+linkgit:git-config[1].
-See gitlink:git-config[1] for more details on the configuration
+See linkgit:git-config[1] for more details on the configuration
options mentioned above.
The "commit" object links a physical state of a tree with a description
of how we got there and why. Use the --pretty=raw option to
-gitlink:git-show[1] or gitlink:git-log[1] to examine your favorite
+linkgit:git-show[1] or linkgit:git-log[1] to examine your favorite
commit:
------------------------------------------------
its parents. In particular, git does not attempt to record file renames
explicitly, though it can identify cases where the existence of the same
file data at changing paths suggests a rename. (See, for example, the
--M option to gitlink:git-diff[1]).
+-M option to linkgit:git-diff[1]).
-A commit is usually created by gitlink:git-commit[1], which creates a
+A commit is usually created by linkgit:git-commit[1], which creates a
commit whose parent is normally the current HEAD, and whose tree is
taken from the content currently stored in the index.
Tree Object
~~~~~~~~~~~
-The ever-versatile gitlink:git-show[1] command can also be used to
-examine tree objects, but gitlink:git-ls-tree[1] will give you more
+The ever-versatile linkgit:git-show[1] command can also be used to
+examine tree objects, but linkgit:git-ls-tree[1] will give you more
details:
------------------------------------------------
Blob Object
~~~~~~~~~~~
-You can use gitlink:git-show[1] to examine the contents of a blob; take,
+You can use linkgit:git-show[1] to examine the contents of a blob; take,
for example, the blob in the entry for "COPYING" from the tree above:
------------------------------------------------
renaming a file does not change the object that file is associated with.
Note that any tree or blob object can be examined using
-
gitlink:git-show[1] with the <revision>:<path> syntax. This can
+
linkgit:git-show[1] with the <revision>:<path> syntax. This can
sometimes be useful for browsing the contents of a tree that is not
currently checked out.
A tag object contains an object, object type, tag name, the name of the
person ("tagger") who created the tag, and a message, which may contain
-a signature, as can be seen using the gitlink:git-cat-file[1]:
+a signature, as can be seen using the linkgit:git-cat-file[1]:
------------------------------------------------
$ git cat-file tag v1.5.0
-----END PGP SIGNATURE-----
------------------------------------------------
-See the gitlink:git-tag[1] command to learn how to create and verify tag
-objects. (Note that gitlink:git-tag[1] can also be used to create
+See the linkgit:git-tag[1] command to learn how to create and verify tag
+objects. (Note that linkgit:git-tag[1] can also be used to create
"lightweight tags", which are not tag objects at all, but just simple
references whose names begin with "refs/tags/").
Although the object files are gone, any commands that refer to those
objects will work exactly as they did before.
-The gitlink:git-gc[1] command performs packing, pruning, and more for
+The linkgit:git-gc[1] command performs packing, pruning, and more for
you, so is normally the only high-level command you need.
[[dangling-objects]]
Dangling objects
~~~~~~~~~~~~~~~~
-The gitlink:git-fsck[1] command will sometimes complain about dangling
+The linkgit:git-fsck[1] command will sometimes complain about dangling
objects. They are not a problem.
The most common cause of dangling objects is that you've rebased a
especially commits is *much* harder).
Before starting, verify that there is corruption, and figure out where
-it is with gitlink:git-fsck[1]; this may be time-consuming.
+it is with linkgit:git-fsck[1]; this may be time-consuming.
Assume the output looks like this:
points to it. If you could find just one copy of that missing blob
object, possibly in some other repository, you could move it into
.git/objects/4b/9458b3... and be done. Suppose you can't. You can
-still examine the tree that pointed to it with gitlink:git-ls-tree[1],
+still examine the tree that pointed to it with linkgit:git-ls-tree[1],
which might output something like:
------------------------------------------------
say it's in "somedirectory". If you're lucky the missing copy might be
the same as the copy you have checked out in your working tree at
"somedirectory/myfile"; you can test whether that's right with
-gitlink:git-hash-object[1]:
+linkgit:git-hash-object[1]:
------------------------------------------------
$ git hash-object -w somedirectory/myfile
The index is a binary file (generally kept in .git/index) containing a
sorted list of path names, each with permissions and the SHA1 of a blob
-object; gitlink:git-ls-files[1] can show you the contents of the index:
+object; linkgit:git-ls-files[1] can show you the contents of the index:
-------------------------------------------------
$ git ls-files --stage
1. The index contains all the information necessary to generate a single
(uniquely determined) tree object.
+
-For example, running gitlink:git-commit[1] generates this tree object
+For example, running linkgit:git-commit[1] generates this tree object
from the index, stores it in the object database, and uses it as the
tree object associated with the new commit.
+
We saw in <<conflict-resolution>> that during a merge the index can
store multiple versions of a single file (called "stages"). The third
-column in the gitlink:git-ls-files[1] output above is the stage
+column in the linkgit:git-ls-files[1] output above is the stage
number, and will take on values other than 0 for files with merge
conflicts.
Partial checkouts of the superproject are possible: you can tell Git to
clone none, some or all of the submodules.
-The gitlink:git-submodule[1] command is available since Git 1.5.3. Users
+The linkgit:git-submodule[1] command is available since Git 1.5.3. Users
with Git 1.5.2 can look up the submodule commits in the repository and
manually check them out; earlier versions won't recognize the submodules at
all.
- It clones the submodule under the current directory and by default checks out
the master branch.
-- It adds the submodule's clone path to the gitlink:gitmodules[5] file and
+- It adds the submodule's clone path to the linkgit:gitmodules[5] file and
adds this file to the index, ready to be committed.
- It adds the submodule's current commit ID to the index, ready to be
committed.
Object access and manipulation
------------------------------
-The gitlink:git-cat-file[1] command can show the contents of any object,
-though the higher-level gitlink:git-show[1] is usually more useful.
+The linkgit:git-cat-file[1] command can show the contents of any object,
+though the higher-level linkgit:git-show[1] is usually more useful.
-The gitlink:git-commit-tree[1] command allows constructing commits with
+The linkgit:git-commit-tree[1] command allows constructing commits with
arbitrary parents and trees.
-A tree can be created with gitlink:git-write-tree[1] and its data can be
-accessed by gitlink:git-ls-tree[1]. Two trees can be compared with
-gitlink:git-diff-tree[1].
+A tree can be created with linkgit:git-write-tree[1] and its data can be
+accessed by linkgit:git-ls-tree[1]. Two trees can be compared with
+linkgit:git-diff-tree[1].
-A tag is created with gitlink:git-mktag[1], and the signature can be
-verified by gitlink:git-verify-tag[1], though it is normally simpler to
-use gitlink:git-tag[1] for both.
+A tag is created with linkgit:git-mktag[1], and the signature can be
+verified by linkgit:git-verify-tag[1], though it is normally simpler to
+use linkgit:git-tag[1] for both.
[[the-workflow]]
The Workflow
------------
-High-level operations such as gitlink:git-commit[1],
-gitlink:git-checkout[1] and gitlink:git-reset[1] work by moving data
+High-level operations such as linkgit:git-commit[1],
+linkgit:git-checkout[1] and linkgit:git-reset[1] work by moving data
between the working tree, the index, and the object database. Git
provides low-level operations which perform each of these steps
individually.
working directory -> index
~~~~~~~~~~~~~~~~~~~~~~~~~~
-The gitlink:git-update-index[1] command updates the index with
+The linkgit:git-update-index[1] command updates the index with
information from the working directory. You generally update the
index information by just specifying the filename you want to update,
like so:
it will only update the fields that are used to quickly test whether
an object still matches its old backing store object.
-The previously introduced gitlink:git-add[1] is just a wrapper for
-gitlink:git-update-index[1].
+The previously introduced linkgit:git-add[1] is just a wrapper for
+linkgit:git-update-index[1].
[[index-to-object-database]]
index -> object database
You can examine the data represented in the object database and the
index with various helper tools. For every object, you can use
-gitlink:git-cat-file[1] to examine details about the
+linkgit:git-cat-file[1] to examine details about the
object:
-------------------------------------------------
- howto's
- some of technical/?
- hooks
-- list of commands in gitlink:git[1]
+- list of commands in linkgit:git[1]
Scan email archives for other stuff left out
My Various Git Projects / git.git / commitdiff