зеркало из https://github.com/microsoft/git.git
Documentation: be consistent about "git-" versus "git "
Since the git-* commands are not installed in $(bindir), using "git-command <parameters>" in examples in the documentation is not a good idea. On the other hand, it is nice to be able to refer to each command using one hyphenated word. (There is no escaping it, anyway: man page names cannot have spaces in them.) This patch retains the dash in naming an operation, command, program, process, or action. Complete command lines that can be entered at a shell (i.e., without options omitted) are made to use the dashless form. The changes consist only of replacing some spaces with hyphens and vice versa. After a "s/ /-/g", the unpatched and patched versions are identical. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
Junio C Hamano
Родитель
46e56e81b3
Коммит
b1889c36d8
|
|
@ -8,7 +8,7 @@ git-add - Add file contents to the index
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
|
||||
'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
|
||||
[--update | -u] [--refresh] [--ignore-errors] [--]
|
||||
<filepattern>...
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ git-am - Apply a series of patches from a mailbox
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-am' [--signoff] [--keep] [--utf8 | --no-utf8]
|
||||
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
|
||||
[--3way] [--interactive] [--binary]
|
||||
[--whitespace=<option>] [-C<n>] [-p<n>]
|
||||
<mbox>|<Maildir>...
|
||||
'git-am' [--skip | --resolved]
|
||||
'git am' [--skip | --resolved]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-annotate - Annotate file lines with commit info
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
git-annotate [options] file [revision]
|
||||
git annotate [options] file [revision]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-apply - Apply a patch on a git index file and a working tree
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-apply' [--stat] [--numstat] [--summary] [--check] [--index]
|
||||
'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
|
||||
[--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse]
|
||||
[--allow-binary-replacement | --binary] [--reject] [-z]
|
||||
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-archimport - Import an Arch repository into git
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
|
||||
'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
|
||||
<archive/branch>[:<git-branch>] ...
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-archive - Create an archive of files from a named tree
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
|
||||
'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
|
||||
[--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
|
||||
[path...]
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ on the subcommand:
|
|||
git bisect log
|
||||
git bisect run <cmd>...
|
||||
|
||||
This command uses 'git-rev-list --bisect' option to help drive the
|
||||
This command uses 'git rev-list --bisect' option to help drive the
|
||||
binary search process to find which change introduced a bug, given an
|
||||
old "good" commit object name and a later "bad" commit object name.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-blame - Show what revision and author last modified each line of a file
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
|
||||
'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
|
||||
[-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
|
||||
[<rev> | --contents <file>] [--] <file>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ git-branch - List, create, or delete branches
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
|
||||
'git branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
|
||||
[-v [--abbrev=<length> | --no-abbrev]]
|
||||
[--contains <commit>]
|
||||
'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
|
||||
'git-branch' (-m | -M) [<oldbranch>] <newbranch>
|
||||
'git-branch' (-d | -D) [-r] <branchname>...
|
||||
'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
|
||||
'git branch' (-m | -M) [<oldbranch>] <newbranch>
|
||||
'git branch' (-d | -D) [-r] <branchname>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ git-bundle - Move objects and refs by archive
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-bundle' create <file> <git-rev-list args>
|
||||
'git-bundle' verify <file>
|
||||
'git-bundle' list-heads <file> [refname...]
|
||||
'git-bundle' unbundle <file> [refname...]
|
||||
'git bundle' create <file> <git-rev-list args>
|
||||
'git bundle' verify <file>
|
||||
'git bundle' list-heads <file> [refname...]
|
||||
'git bundle' unbundle <file> [refname...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -116,7 +116,7 @@ We set a tag in R1 (lastR2bundle) after the previous such transport,
|
|||
and move it afterwards to help build the bundle.
|
||||
|
||||
------------
|
||||
$ git-bundle create mybundle master ^lastR2bundle
|
||||
$ git bundle create mybundle master ^lastR2bundle
|
||||
$ git tag -f lastR2bundle master
|
||||
------------
|
||||
|
||||
|
|
@ -141,8 +141,8 @@ $ git bundle create mybundle master -n 10
|
|||
Then you move mybundle from A to B, and in R2 on B:
|
||||
|
||||
------------
|
||||
$ git-bundle verify mybundle
|
||||
$ git-fetch mybundle master:localRef
|
||||
$ git bundle verify mybundle
|
||||
$ git fetch mybundle master:localRef
|
||||
------------
|
||||
|
||||
With something like this in the config in R2:
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ git-cat-file - Provide content or type/size information for repository objects
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-cat-file' [-t | -s | -e | -p | <type>] <object>
|
||||
'git-cat-file' [--batch | --batch-check] < <list-of-objects>
|
||||
'git cat-file' [-t | -s | -e | -p | <type>] <object>
|
||||
'git cat-file' [--batch | --batch-check] < <list-of-objects>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-check-attr - Display gitattributes information.
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-check-attr' attr... [--] pathname...
|
||||
'git check-attr' attr... [--] pathname...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-check-ref-format - Make sure ref name is well formed
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-check-ref-format' <refname>
|
||||
'git check-ref-format' <refname>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -47,7 +47,7 @@ refname expressions (see linkgit:git-rev-parse[1]). Namely:
|
|||
. 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
|
||||
linkgit: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
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-checkout-index - Copy files from the index to the working tree
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
|
||||
'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
|
||||
[--stage=<number>|all]
|
||||
[--temp]
|
||||
[-z] [--stdin]
|
||||
|
|
@ -73,16 +73,16 @@ OPTIONS
|
|||
|
||||
The order of the flags used to matter, but not anymore.
|
||||
|
||||
Just doing `git-checkout-index` does nothing. You probably meant
|
||||
`git-checkout-index -a`. And if you want to force it, you want
|
||||
`git-checkout-index -f -a`.
|
||||
Just doing `git checkout-index` does nothing. You probably meant
|
||||
`git checkout-index -a`. And if you want to force it, you want
|
||||
`git checkout-index -f -a`.
|
||||
|
||||
Intuitiveness is not the goal here. Repeatability is. The reason for
|
||||
the "no arguments means no work" behavior is that from scripts you are
|
||||
supposed to be able to do:
|
||||
|
||||
----------------
|
||||
$ find . -name '*.h' -print0 | xargs -0 git-checkout-index -f --
|
||||
$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --
|
||||
----------------
|
||||
|
||||
which will force all existing `*.h` files to be replaced with their
|
||||
|
|
@ -91,7 +91,7 @@ force-refresh everything in the index, which was not the point. But
|
|||
since git-checkout-index accepts --stdin it would be faster to use:
|
||||
|
||||
----------------
|
||||
$ find . -name '*.h' -print0 | git-checkout-index -f -z --stdin
|
||||
$ find . -name '*.h' -print0 | git checkout-index -f -z --stdin
|
||||
----------------
|
||||
|
||||
The `--` is just a good idea when you know the rest will be filenames;
|
||||
|
|
@ -144,7 +144,7 @@ EXAMPLES
|
|||
To update and refresh only the files already checked out::
|
||||
+
|
||||
----------------
|
||||
$ git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
|
||||
$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh
|
||||
----------------
|
||||
|
||||
Using `git-checkout-index` to "export an entire tree"::
|
||||
|
|
@ -153,10 +153,10 @@ Using `git-checkout-index` to "export an entire tree"::
|
|||
Just read the desired tree into the index, and do:
|
||||
+
|
||||
----------------
|
||||
$ git-checkout-index --prefix=git-export-dir/ -a
|
||||
$ git checkout-index --prefix=git-export-dir/ -a
|
||||
----------------
|
||||
+
|
||||
`git-checkout-index` will "export" the index into the specified
|
||||
`git checkout-index` will "export" the index into the specified
|
||||
directory.
|
||||
+
|
||||
The final "/" is important. The exported name is literally just
|
||||
|
|
@ -166,7 +166,7 @@ following example.
|
|||
Export files with a prefix::
|
||||
+
|
||||
----------------
|
||||
$ git-checkout-index --prefix=.merged- Makefile
|
||||
$ git checkout-index --prefix=.merged- Makefile
|
||||
----------------
|
||||
+
|
||||
This will check out the currently cached copy of `Makefile`
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ git-checkout - Checkout a branch or paths to the working tree
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]
|
||||
'git-checkout' [<tree-ish>] <paths>...
|
||||
'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]
|
||||
'git checkout' [<tree-ish>] <paths>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -23,7 +23,7 @@ options, which will be passed to `git branch`.
|
|||
|
||||
When <paths> are given, this command does *not* switch
|
||||
branches. It updates the named paths in the working tree from
|
||||
the index file (i.e. it runs `git-checkout-index -f -u`), or
|
||||
the index file (i.e. it runs `git checkout-index -f -u`), or
|
||||
from a named commit. In
|
||||
this case, the `-f` and `-b` options are meaningless and giving
|
||||
either of them results in an error. <tree-ish> argument can be
|
||||
|
|
@ -112,7 +112,7 @@ current branch and directly point at the commit named by the tag
|
|||
(`v2.6.18` in the above example).
|
||||
|
||||
You can use usual git commands while in this state. You can use
|
||||
`git-reset --hard $othercommit` to further move around, for
|
||||
`git reset --hard $othercommit` to further move around, for
|
||||
example. You can make changes and create a new commit on top of
|
||||
a detached HEAD. You can even create a merge by using `git
|
||||
merge $othercommit`.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit>
|
||||
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-cherry' [-v] <upstream> [<head>] [<limit>]
|
||||
'git cherry' [-v] <upstream> [<head>] [<limit>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...
|
||||
'git clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-clone - Clone a repository into a new directory
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-clone' [--template=<template_directory>]
|
||||
'git clone' [--template=<template_directory>]
|
||||
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]
|
||||
[-o <name>] [-u <upload-pack>] [--reference <repository>]
|
||||
[--depth <depth>] [--] <repository> [<directory>]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-commit-tree - Create a new commit object
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-commit-tree' <tree> [-p <parent commit>]\* < changelog
|
||||
'git commit-tree' <tree> [-p <parent commit>]\* < changelog
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-commit - Record changes to the repository
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]
|
||||
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]
|
||||
[(-c | -C) <commit>] [-F <file> | -m <msg>]
|
||||
[--allow-empty] [--no-verify] [-e] [--author=<author>]
|
||||
[--cleanup=<mode>] [--] [[-i | -o ]<file>...]
|
||||
|
|
@ -207,7 +207,7 @@ 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 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>`,
|
||||
to that of the last commit with `git reset HEAD -- <file>`,
|
||||
which effectively reverts `git-add` and prevents the changes to
|
||||
this file from participating in the next commit. After building
|
||||
the state to be committed incrementally with these commands,
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@ git-config - Get and set repository or global options
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-config' [<file-option>] [type] [-z|--null] name [value [value_regex]]
|
||||
'git-config' [<file-option>] [type] --add name value
|
||||
'git-config' [<file-option>] [type] --replace-all name [value [value_regex]]
|
||||
'git-config' [<file-option>] [type] [-z|--null] --get name [value_regex]
|
||||
'git-config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]
|
||||
'git-config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]
|
||||
'git-config' [<file-option>] --unset name [value_regex]
|
||||
'git-config' [<file-option>] --unset-all name [value_regex]
|
||||
'git-config' [<file-option>] --rename-section old_name new_name
|
||||
'git-config' [<file-option>] --remove-section name
|
||||
'git-config' [<file-option>] [-z|--null] -l | --list
|
||||
'git-config' [<file-option>] --get-color name [default]
|
||||
'git-config' [<file-option>] --get-colorbool name [stdout-is-tty]
|
||||
'git config' [<file-option>] [type] [-z|--null] name [value [value_regex]]
|
||||
'git config' [<file-option>] [type] --add name value
|
||||
'git config' [<file-option>] [type] --replace-all name [value [value_regex]]
|
||||
'git config' [<file-option>] [type] [-z|--null] --get name [value_regex]
|
||||
'git config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]
|
||||
'git config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]
|
||||
'git config' [<file-option>] --unset name [value_regex]
|
||||
'git config' [<file-option>] --unset-all name [value_regex]
|
||||
'git config' [<file-option>] --rename-section old_name new_name
|
||||
'git config' [<file-option>] --remove-section name
|
||||
'git config' [<file-option>] [-z|--null] -l | --list
|
||||
'git config' [<file-option>] --get-color name [default]
|
||||
'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-count-objects - Count unpacked number of objects and their disk consumption
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-count-objects' [-v]
|
||||
'git count-objects' [-v]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -22,7 +22,7 @@ OPTIONS
|
|||
In addition to the number of loose objects and disk
|
||||
space consumed, it reports the number of in-pack
|
||||
objects, number of packs, and number of objects that can be
|
||||
removed by running `git-prune-packed`.
|
||||
removed by running `git prune-packed`.
|
||||
|
||||
|
||||
Author
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
|
||||
'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -89,14 +89,14 @@ Merge one patch into CVS::
|
|||
------------
|
||||
$ export GIT_DIR=~/project/.git
|
||||
$ cd ~/project_cvs_checkout
|
||||
$ git-cvsexportcommit -v <commit-sha1>
|
||||
$ git cvsexportcommit -v <commit-sha1>
|
||||
$ cvs commit -F .msg <files>
|
||||
------------
|
||||
|
||||
Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo::
|
||||
+
|
||||
------------
|
||||
$ git-cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>
|
||||
$ git cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>
|
||||
------------
|
||||
|
||||
Merge pending patches into CVS automatically -- only if you really know what you are doing::
|
||||
|
|
@ -104,7 +104,7 @@ Merge pending patches into CVS automatically -- only if you really know what you
|
|||
------------
|
||||
$ export GIT_DIR=~/project/.git
|
||||
$ cd ~/project_cvs_checkout
|
||||
$ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v
|
||||
$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v
|
||||
------------
|
||||
|
||||
Author
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-cvsimport - Salvage your data out of another SCM people love to hate
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]
|
||||
'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]
|
||||
[-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]
|
||||
[-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
|
||||
[-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]
|
||||
|
|
@ -27,7 +27,7 @@ At least version 2.1 is required.
|
|||
You should *never* do any work of your own on the branches that are
|
||||
created by git-cvsimport. By default initial import will create and populate a
|
||||
"master" branch from the CVS repository's main branch which you're free
|
||||
to work with; after that, you need to 'git merge' incremental imports, or
|
||||
to work with; after that, you need to 'git-merge' incremental imports, or
|
||||
any CVS branches, yourself. It is advisable to specify a named remote via
|
||||
-r to separate and protect the incoming branches.
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
|
|||
Usage:
|
||||
|
||||
[verse]
|
||||
'git-cvsserver' [options] [pserver|server] [<directory> ...]
|
||||
'git cvsserver' [options] [pserver|server] [<directory> ...]
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-daemon - A really simple server for git repositories
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-daemon' [--verbose] [--syslog] [--export-all]
|
||||
'git daemon' [--verbose] [--syslog] [--export-all]
|
||||
[--timeout=n] [--init-timeout=n] [--strict-paths]
|
||||
[--base-path=path] [--user-path | --user-path=path]
|
||||
[--interpolated-path=pathtemplate]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-describe - Show the most recent tag that is reachable from a commit
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-describe' [--all] [--tags] [--contains] [--abbrev=<n>] <committish>...
|
||||
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <committish>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -78,7 +78,7 @@ EXAMPLES
|
|||
|
||||
With something like git.git current tree, I get:
|
||||
|
||||
[torvalds@g5 git]$ git-describe parent
|
||||
[torvalds@g5 git]$ git describe parent
|
||||
v1.0.4-14-g2414721
|
||||
|
||||
i.e. the current head of my "parent" branch is based on v1.0.4,
|
||||
|
|
@ -94,7 +94,7 @@ of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`).
|
|||
|
||||
Doing a "git-describe" on a tag-name will just show the tag name:
|
||||
|
||||
[torvalds@g5 git]$ git-describe v1.0.4
|
||||
[torvalds@g5 git]$ git describe v1.0.4
|
||||
v1.0.4
|
||||
|
||||
With --all, the command can use branch heads as references, so
|
||||
|
|
@ -115,13 +115,13 @@ closest tagname without any suffix:
|
|||
SEARCH STRATEGY
|
||||
---------------
|
||||
|
||||
For each committish supplied "git describe" will first look for
|
||||
For each committish supplied "git-describe" will first look for
|
||||
a tag which tags exactly that commit. Annotated tags will always
|
||||
be preferred over lightweight tags, and tags with newer dates will
|
||||
always be preferred over tags with older dates. If an exact match
|
||||
is found, its name will be output and searching will stop.
|
||||
|
||||
If an exact match was not found "git describe" will walk back
|
||||
If an exact match was not found "git-describe" will walk back
|
||||
through the commit history to locate an ancestor commit which
|
||||
has been tagged. The ancestor's tag will be output along with an
|
||||
abbreviation of the input committish's SHA1.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
|
||||
'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-diff-index - Compares content and mode of blobs between the index and reposi
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
|
||||
'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -57,20 +57,20 @@ some files in the index and are ready to commit. You want to see exactly
|
|||
*what* you are going to commit, without having to write a new tree
|
||||
object and compare it that way, and to do that, you just do
|
||||
|
||||
git-diff-index --cached HEAD
|
||||
git diff-index --cached HEAD
|
||||
|
||||
Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had
|
||||
done an "git-update-index" to make that effective in the index file.
|
||||
"git-diff-files" wouldn't show anything at all, since the index file
|
||||
"git diff-files" wouldn't show anything at all, since the index file
|
||||
matches my working directory. But doing a "git-diff-index" does:
|
||||
|
||||
torvalds@ppc970:~/git> git-diff-index --cached HEAD
|
||||
torvalds@ppc970:~/git> git diff-index --cached HEAD
|
||||
-100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c
|
||||
+100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c
|
||||
|
||||
You can see easily that the above is a rename.
|
||||
|
||||
In fact, "git-diff-index --cached" *should* always be entirely equivalent to
|
||||
In fact, "git diff-index --cached" *should* always be entirely equivalent to
|
||||
actually doing a "git-write-tree" and comparing that. Except this one is much
|
||||
nicer for the case where you just want to check where you are.
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ show that. So let's say that you have edited `kernel/sched.c`, but
|
|||
have not actually done a "git-update-index" on it yet - there is no
|
||||
"object" associated with the new state, and you get:
|
||||
|
||||
torvalds@ppc970:~/v2.6/linux> git-diff-index HEAD
|
||||
torvalds@ppc970:~/v2.6/linux> git diff-index HEAD
|
||||
*100644->100664 blob 7476bb......->000000...... kernel/sched.c
|
||||
|
||||
i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
|
||||
'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
|
||||
[-t] [-r] [-c | --cc] [--root] [<common diff options>]
|
||||
<tree-ish> [<tree-ish>] [<path>...]
|
||||
|
||||
|
|
@ -112,13 +112,13 @@ Limiting Output
|
|||
If you're only interested in differences in a subset of files, for
|
||||
example some architecture-specific files, you might do:
|
||||
|
||||
git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
|
||||
git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
|
||||
|
||||
and it will only show you what changed in those two directories.
|
||||
|
||||
Or if you are searching for what changed in just `kernel/sched.c`, just do
|
||||
|
||||
git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
|
||||
git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
|
||||
|
||||
and it will ignore all differences to other files.
|
||||
|
||||
|
|
@ -129,7 +129,7 @@ so it can be used to name subdirectories.
|
|||
|
||||
An example of normal usage is:
|
||||
|
||||
torvalds@ppc970:~/git> git-diff-tree 5319e4......
|
||||
torvalds@ppc970:~/git> git diff-tree 5319e4......
|
||||
*100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c
|
||||
|
||||
which tells you that the last commit changed just one file (it's from
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ git-diff - Show changes between commits, commit and working tree, etc
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
|
||||
'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Show changes between two trees, a tree and the working tree, a
|
||||
tree and the index file, or the index file and the working tree.
|
||||
|
||||
'git-diff' [--options] [--] [<path>...]::
|
||||
'git diff' [--options] [--] [<path>...]::
|
||||
|
||||
This form is to view the changes you made relative to
|
||||
the index (staging area for the next commit). In other
|
||||
|
|
@ -27,14 +27,14 @@ If exactly two paths are given, and at least one is untracked,
|
|||
compare the two files / directories. This behavior can be
|
||||
forced by --no-index.
|
||||
|
||||
'git-diff' [--options] --cached [<commit>] [--] [<path>...]::
|
||||
'git diff' [--options] --cached [<commit>] [--] [<path>...]::
|
||||
|
||||
This form is to view the changes you staged for the next
|
||||
commit relative to the named <commit>. Typically you
|
||||
would want comparison with the latest commit, so if you
|
||||
do not give <commit>, it defaults to HEAD.
|
||||
|
||||
'git-diff' [--options] <commit> [--] [<path>...]::
|
||||
'git diff' [--options] <commit> [--] [<path>...]::
|
||||
|
||||
This form is to view the changes you have in your
|
||||
working tree relative to the named <commit>. You can
|
||||
|
|
@ -42,23 +42,23 @@ forced by --no-index.
|
|||
branch name to compare with the tip of a different
|
||||
branch.
|
||||
|
||||
'git-diff' [--options] <commit> <commit> [--] [<path>...]::
|
||||
'git diff' [--options] <commit> <commit> [--] [<path>...]::
|
||||
|
||||
This is to view the changes between two arbitrary
|
||||
<commit>.
|
||||
|
||||
'git-diff' [--options] <commit>..<commit> [--] [<path>...]::
|
||||
'git diff' [--options] <commit>..<commit> [--] [<path>...]::
|
||||
|
||||
This is synonymous to the previous form. If <commit> on
|
||||
one side is omitted, it will have the same effect as
|
||||
using HEAD instead.
|
||||
|
||||
'git-diff' [--options] <commit>\...<commit> [--] [<path>...]::
|
||||
'git diff' [--options] <commit>\...<commit> [--] [<path>...]::
|
||||
|
||||
This form is to view the changes on the branch containing
|
||||
and up to the second <commit>, starting at a common ancestor
|
||||
of both <commit>. "git-diff A\...B" is equivalent to
|
||||
"git-diff $(git-merge-base A B) B". You can omit any one
|
||||
of both <commit>. "git diff A\...B" is equivalent to
|
||||
"git diff $(git-merge-base A B) B". You can omit any one
|
||||
of <commit>, which has the same effect as using HEAD instead.
|
||||
|
||||
Just in case if you are doing something exotic, it should be
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-fast-export - Git data exporter
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-fast-export [options]' | 'git-fast-import'
|
||||
'git fast-export [options]' | 'git fast-import'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-fast-import - Backend for fast Git data importers
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
frontend | 'git-fast-import' [options]
|
||||
frontend | 'git fast-import' [options]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -126,7 +126,7 @@ Parallel Operation
|
|||
------------------
|
||||
Like `git-push` or `git-fetch`, imports handled by fast-import are safe to
|
||||
run alongside parallel `git repack -a -d` or `git gc` invocations,
|
||||
or any other Git operation (including `git prune`, as loose objects
|
||||
or any other Git operation (including `git-prune`, as loose objects
|
||||
are never used by fast-import).
|
||||
|
||||
fast-import does not lock the branch or tag refs it is actively importing.
|
||||
|
|
@ -803,7 +803,7 @@ Callers may wish to process the output through a tool such as sed to
|
|||
remove the leading part of the line, for example:
|
||||
|
||||
====
|
||||
frontend | git-fast-import | sed 's/^progress //'
|
||||
frontend | git fast-import | sed 's/^progress //'
|
||||
====
|
||||
|
||||
Placing a `progress` command immediately after a `checkpoint` will
|
||||
|
|
@ -851,7 +851,7 @@ An example crash:
|
|||
M 777 inline bob
|
||||
END_OF_INPUT
|
||||
|
||||
$ git-fast-import <in
|
||||
$ git fast-import <in
|
||||
fatal: Corrupt mode: M 777 inline bob
|
||||
fast-import: dumping crash report to .git/fast_import_crash_8434
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-fetch-pack - Receive missing objects from another repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]
|
||||
'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-fetch - Download objects and refs from another repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-fetch' <options> <repository> <refspec>...
|
||||
'git fetch' <options> <repository> <refspec>...
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -18,7 +18,7 @@ the objects necessary to complete them.
|
|||
|
||||
The ref names and their object names of fetched refs are stored
|
||||
in `.git/FETCH_HEAD`. This information is left for a later merge
|
||||
operation done by "git merge".
|
||||
operation done by "git-merge".
|
||||
|
||||
When <refspec> stores the fetched result in tracking branches,
|
||||
the tags that point at these branches are automatically
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-filter-branch - Rewrite branches
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-filter-branch' [--env-filter <command>] [--tree-filter <command>]
|
||||
'git filter-branch' [--env-filter <command>] [--tree-filter <command>]
|
||||
[--index-filter <command>] [--parent-filter <command>]
|
||||
[--msg-filter <command>] [--commit-filter <command>]
|
||||
[--tag-name-filter <command>] [--subdirectory-filter <directory>]
|
||||
|
|
@ -266,7 +266,7 @@ git filter-branch --msg-filter '
|
|||
|
||||
To restrict rewriting to only part of the history, specify a revision
|
||||
range in addition to the new branch name. The new branch name will
|
||||
point to the top-most revision that a 'git rev-list' of this range
|
||||
point to the top-most revision that a 'git-rev-list' of this range
|
||||
will print.
|
||||
|
||||
*NOTE* the changes introduced by the commits, and which are not reverted
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ git-fmt-merge-msg - Produce a merge commit message
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
git-fmt-merge-msg [--log | --no-log] <$GIT_DIR/FETCH_HEAD
|
||||
git-fmt-merge-msg [--log | --no-log] -F <file>
|
||||
git fmt-merge-msg [--log | --no-log] <$GIT_DIR/FETCH_HEAD
|
||||
git fmt-merge-msg [--log | --no-log] -F <file>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-for-each-ref - Output information on each ref
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
|
||||
'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
|
||||
[--sort=<key>]\* [--format=<format>] [<pattern>...]
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -119,7 +119,7 @@ An example directly producing formatted text. Show the most recent
|
|||
------------
|
||||
#!/bin/sh
|
||||
|
||||
git-for-each-ref --count=3 --sort='-*authordate' \
|
||||
git for-each-ref --count=3 --sort='-*authordate' \
|
||||
--format='From: %(*authorname) %(*authoremail)
|
||||
Subject: %(*subject)
|
||||
Date: %(*authordate)
|
||||
|
|
@ -135,7 +135,7 @@ demonstrating the use of --shell. List the prefixes of all heads::
|
|||
------------
|
||||
#!/bin/sh
|
||||
|
||||
git-for-each-ref --shell --format="ref=%(refname)" refs/heads | \
|
||||
git for-each-ref --shell --format="ref=%(refname)" refs/heads | \
|
||||
while read entry
|
||||
do
|
||||
eval "$entry"
|
||||
|
|
@ -189,7 +189,7 @@ Its message reads as:
|
|||
fi
|
||||
'
|
||||
|
||||
eval=`git-for-each-ref --shell --format="$fmt" \
|
||||
eval=`git for-each-ref --shell --format="$fmt" \
|
||||
--sort='*objecttype' \
|
||||
--sort=-taggerdate \
|
||||
refs/tags`
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-format-patch - Prepare patches for e-mail submission
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-format-patch' [-k] [-o <dir> | --stdout] [--thread]
|
||||
'git format-patch' [-k] [-o <dir> | --stdout] [--thread]
|
||||
[--attach[=<boundary>] | --inline[=<boundary>]]
|
||||
[-s | --signoff] [<common diff options>]
|
||||
[-n | --numbered | -N | --no-numbered]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-fsck-objects - Verifies the connectivity and validity of the objects in the
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-fsck-objects' ...
|
||||
'git fsck-objects' ...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-fsck - Verifies the connectivity and validity of the objects in the database
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
|
||||
'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
|
||||
[--full] [--strict] [--verbose] [--lost-found] [<object>*]
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -79,7 +79,7 @@ that aren't readable from any of the specified head nodes.
|
|||
|
||||
So for example
|
||||
|
||||
git-fsck --unreachable HEAD $(cat .git/refs/heads/*)
|
||||
git fsck --unreachable HEAD $(cat .git/refs/heads/*)
|
||||
|
||||
will do quite a _lot_ of verification on the tree. There are a few
|
||||
extra validity tests to be added (make sure that tree objects are
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-gc' [--aggressive] [--auto] [--quiet]
|
||||
'git gc' [--aggressive] [--auto] [--quiet]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -41,7 +41,7 @@ OPTIONS
|
|||
few hundred changesets or so.
|
||||
|
||||
--auto::
|
||||
With this option, `git gc` checks whether any housekeeping is
|
||||
With this option, `git-gc` checks whether any housekeeping is
|
||||
required; if not, it exits without performing any work.
|
||||
Some git commands run `git gc --auto` after performing
|
||||
operations that could create many loose objects.
|
||||
|
|
@ -89,7 +89,7 @@ how long records of conflicted merge you have not resolved are
|
|||
kept. This defaults to 15 days.
|
||||
|
||||
The optional configuration variable 'gc.packrefs' determines if
|
||||
`git gc` runs `git-pack-refs`. This can be set to "nobare" to enable
|
||||
`git-gc` runs `git-pack-refs`. This can be set to "nobare" to enable
|
||||
it within all non-bare repos or it can be set to a boolean value.
|
||||
This defaults to true.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-get-tar-commit-id - Extract commit ID from an archive created using git-arch
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-get-tar-commit-id' < <tarfile>
|
||||
'git get-tar-commit-id' < <tarfile>
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-grep - Print lines matching a pattern
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-grep' [--cached]
|
||||
'git grep' [--cached]
|
||||
[-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
|
||||
[-v | --invert-match] [-h|-H] [--full-name]
|
||||
[-E | --extended-regexp] [-G | --basic-regexp]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-hash-object - Compute object ID and optionally creates a blob from a file
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-hash-object' [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>...
|
||||
'git hash-object' [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-http-fetch - Download from a remote git repository via HTTP
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>
|
||||
'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
|
||||
'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-imap-send - Dump a mailbox from stdin into an imap folder
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-imap-send'
|
||||
'git imap-send'
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -20,7 +20,7 @@ files directly.
|
|||
|
||||
Typical usage is something like:
|
||||
|
||||
git-format-patch --signoff --stdout --attach origin | git-imap-send
|
||||
git format-patch --signoff --stdout --attach origin | git imap-send
|
||||
|
||||
|
||||
CONFIGURATION
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ git-index-pack - Build pack index file for an existing packed archive
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-index-pack' [-v] [-o <index-file>] <pack-file>
|
||||
'git-index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]
|
||||
'git index-pack' [-v] [-o <index-file>] <pack-file>
|
||||
'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]
|
||||
[<pack-file>]
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-init-db - Creates an empty git repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-init-db' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]
|
||||
'git init-db' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-init - Create an empty git repository or reinitialize an existing one
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-init' [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]
|
||||
'git init' [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]
|
||||
|
||||
|
||||
OPTIONS
|
||||
|
|
@ -105,8 +105,8 @@ Start a new git repository for an existing code base::
|
|||
+
|
||||
----------------
|
||||
$ cd /path/to/my/codebase
|
||||
$ git-init <1>
|
||||
$ git-add . <2>
|
||||
$ git init <1>
|
||||
$ git add . <2>
|
||||
----------------
|
||||
+
|
||||
<1> prepare /path/to/my/codebase/.git directory
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ git-instaweb - Instantly browse your working repository in gitweb
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-instaweb' [--local] [--httpd=<httpd>] [--port=<port>]
|
||||
'git instaweb' [--local] [--httpd=<httpd>] [--port=<port>]
|
||||
[--browser=<browser>]
|
||||
'git-instaweb' [--start] [--stop] [--restart]
|
||||
'git instaweb' [--start] [--stop] [--restart]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-log - Show commit logs
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-log' <option>...
|
||||
'git log' <option>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-lost-found - Recover lost refs that luckily have not yet been pruned
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-lost-found'
|
||||
'git lost-found'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-ls-files - Show information about files in the index and the working tree
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-ls-files' [-z] [-t] [-v]
|
||||
'git ls-files' [-z] [-t] [-v]
|
||||
(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])\*
|
||||
(-[c|d|o|i|s|u|k|m])\*
|
||||
[-x <pattern>|--exclude=<pattern>]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-ls-remote - List references in a remote repository
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-ls-remote' [--heads] [--tags] [-u <exec> | --upload-pack <exec>]
|
||||
'git ls-remote' [--heads] [--tags] [-u <exec> | --upload-pack <exec>]
|
||||
<repository> <refs>...
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-ls-tree - List the contents of a tree object
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-ls-tree' [-d] [-r] [-t] [-l] [-z]
|
||||
'git ls-tree' [-d] [-r] [-t] [-l] [-z]
|
||||
[--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
|
||||
<tree-ish> [paths...]
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch>
|
||||
'git mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch>
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -30,7 +30,7 @@ OPTIONS
|
|||
whitespaces, (3) '[' up to ']', typically '[PATCH]', and
|
||||
then prepends "[PATCH] ". This flag forbids this
|
||||
munging, and is most useful when used to read back
|
||||
'git format-patch -k' output.
|
||||
'git-format-patch -k' output.
|
||||
|
||||
-u::
|
||||
The commit log message, author name and author email are
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-mailsplit - Simple UNIX mbox splitter program
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-mailsplit' [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>...]
|
||||
'git mailsplit' [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ git-merge-base - Find as good common ancestors as possible for a merge
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-merge-base' [--all] <commit> <commit>
|
||||
'git merge-base' [--all] <commit> <commit>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
||||
"git-merge-base" finds as good a common ancestor as possible between
|
||||
the two commits. That is, given two commits A and B 'git-merge-base A
|
||||
the two commits. That is, given two commits A and B 'git merge-base A
|
||||
B' will output a commit which is reachable from both A and B through
|
||||
the parent relationship.
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-merge-file - Run a three-way file merge
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
|
||||
'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
|
||||
[-p|--stdout] [-q|--quiet] <current-file> <base-file> <other-file>
|
||||
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ OPTIONS
|
|||
This option may be given up to three times, and
|
||||
specifies labels to be used in place of the
|
||||
corresponding file names in conflict reports. That is,
|
||||
`git-merge-file -L x -L y -L z a b c` generates output that
|
||||
`git merge-file -L x -L y -L z a b c` generates output that
|
||||
looks like it came from files x, y and z instead of
|
||||
from files a, b and c.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*)
|
||||
'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*)
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -53,7 +53,7 @@ original is first. But the argument order to the 3-way merge program
|
|||
|
||||
Examples:
|
||||
|
||||
torvalds@ppc970:~/merge-test> git-merge-index cat MM
|
||||
torvalds@ppc970:~/merge-test> git merge-index cat MM
|
||||
This is MM from the original tree. # original
|
||||
This is modified MM in the branch A. # merge1
|
||||
This is modified MM in the branch B. # merge2
|
||||
|
|
@ -61,7 +61,7 @@ Examples:
|
|||
|
||||
or
|
||||
|
||||
torvalds@ppc970:~/merge-test> git-merge-index cat AA MM
|
||||
torvalds@ppc970:~/merge-test> git merge-index cat AA MM
|
||||
cat: : No such file or directory
|
||||
This is added AA in the branch A.
|
||||
This is added AA in the branch B.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-merge-tree - Show three-way merge without touching index
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-merge-tree' <base-tree> <branch1> <branch2>
|
||||
'git merge-tree' <base-tree> <branch1> <branch2>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ git-merge - Join two or more development histories together
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
|
||||
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
|
||||
[-m <msg>] <remote> <remote>...
|
||||
'git-merge' <msg> HEAD <remote>...
|
||||
'git merge' <msg> HEAD <remote>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -60,7 +60,7 @@ A merge is always between the current `HEAD` and one or more
|
|||
commits (usually, branch head or tag), and the index file must
|
||||
exactly match the
|
||||
tree of `HEAD` commit (i.e. the contents of the last commit) when
|
||||
it happens. In other words, `git-diff --cached HEAD` must
|
||||
it happens. In other words, `git diff --cached HEAD` must
|
||||
report no changes.
|
||||
|
||||
[NOTE]
|
||||
|
|
@ -128,7 +128,7 @@ When there are conflicts, these things happen:
|
|||
3. For conflicting paths, the index file records up to three
|
||||
versions; stage1 stores the version from the common ancestor,
|
||||
stage2 from `HEAD`, and stage3 from the remote branch (you
|
||||
can inspect the stages with `git-ls-files -u`). The working
|
||||
can inspect the stages with `git ls-files -u`). The working
|
||||
tree files have the result of "merge" program; i.e. 3-way
|
||||
merge result with familiar conflict markers `<<< === >>>`.
|
||||
|
||||
|
|
@ -144,7 +144,7 @@ After seeing a conflict, you can do two things:
|
|||
up working tree changes made by 2. and 3.; `git-reset` can
|
||||
be used for this.
|
||||
|
||||
* Resolve the conflicts. `git-diff` would report only the
|
||||
* Resolve the conflicts. `git diff` would report only the
|
||||
conflicting paths because of the above 2. and 3.. Edit the
|
||||
working tree files into a desirable shape, `git-add` or `git-rm`
|
||||
them, to make the index file contain what the merge result
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-mergetool' [--tool=<tool>] [<file>]...
|
||||
'git mergetool' [--tool=<tool>] [<file>]...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -17,7 +17,7 @@ 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
|
||||
specified, `git mergetool` will run the merge tool program on every file
|
||||
specified, `git-mergetool` will run the merge tool program on every file
|
||||
with merge conflicts.
|
||||
|
||||
OPTIONS
|
||||
|
|
@ -27,23 +27,23 @@ OPTIONS
|
|||
Valid merge tools are:
|
||||
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
|
||||
+
|
||||
If a merge resolution program is not specified, `git mergetool`
|
||||
If a merge resolution program is not specified, `git-mergetool`
|
||||
will use the configuration variable `merge.tool`. If the
|
||||
configuration variable `merge.tool` is not set, `git mergetool`
|
||||
configuration variable `merge.tool` is not set, `git-mergetool`
|
||||
will pick a suitable default.
|
||||
+
|
||||
You can explicitly provide a full path to the tool by setting the
|
||||
configuration variable `mergetool.<tool>.path`. For example, you
|
||||
can configure the absolute path to kdiff3 by setting
|
||||
`mergetool.kdiff3.path`. Otherwise, `git mergetool` assumes the
|
||||
`mergetool.kdiff3.path`. Otherwise, `git-mergetool` assumes the
|
||||
tool is available in PATH.
|
||||
+
|
||||
Instead of running one of the known merge tool programs
|
||||
`git mergetool` can be customized to run an alternative program
|
||||
`git-mergetool` can be customized to run an alternative program
|
||||
by specifying the command line to invoke in a configration
|
||||
variable `mergetool.<tool>.cmd`.
|
||||
+
|
||||
When `git mergetool` is invoked with this tool (either through the
|
||||
When `git-mergetool` is invoked with this tool (either through the
|
||||
`-t` or `--tool` option or the `merge.tool` configuration
|
||||
variable) the configured command line will be invoked with `$BASE`
|
||||
set to the name of a temporary file containing the common base for
|
||||
|
|
@ -57,7 +57,7 @@ merge resolution.
|
|||
If the custom merge tool correctly indicates the success of a
|
||||
merge resolution with its exit code then the configuration
|
||||
variable `mergetool.<tool>.trustExitCode` can be set to `true`.
|
||||
Otherwise, `git mergetool` will prompt the user to indicate the
|
||||
Otherwise, `git-mergetool` will prompt the user to indicate the
|
||||
success of the resolution after the custom tool has exited.
|
||||
|
||||
Author
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-mktag - Creates a tag object
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-mktag' < signature_file
|
||||
'git mktag' < signature_file
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-mktree - Build a tree-object from ls-tree formatted text
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-mktree' [-z]
|
||||
'git mktree' [-z]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ git-mv - Move or rename a file, a directory, or a symlink
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-mv' <options>... <args>...
|
||||
'git mv' <options>... <args>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This script is used to move or rename a file, directory or symlink.
|
||||
|
||||
git-mv [-f] [-n] <source> <destination>
|
||||
git-mv [-f] [-n] [-k] <source> ... <destination directory>
|
||||
git mv [-f] [-n] <source> <destination>
|
||||
git mv [-f] [-n] [-k] <source> ... <destination directory>
|
||||
|
||||
In the first form, it renames <source>, which must exist and be either
|
||||
a file, symlink or directory, to <destination>.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-name-rev - Find symbolic names for given revs
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-name-rev' [--tags] [--refs=<pattern>]
|
||||
'git name-rev' [--tags] [--refs=<pattern>]
|
||||
( --all | --stdin | <committish>... )
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-pack-objects - Create a packed archive of objects
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty]
|
||||
'git pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty]
|
||||
[--local] [--incremental] [--window=N] [--depth=N] [--all-progress]
|
||||
[--revs [--unpacked | --all]*] [--stdout | base-name] < object-list
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-pack-redundant - Find redundant pack files
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >
|
||||
'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -21,8 +21,8 @@ given will be ignored when checking which packs are required. This makes the
|
|||
following command useful when wanting to remove packs which contain unreachable
|
||||
objects.
|
||||
|
||||
git-fsck --full --unreachable | cut -d ' ' -f3 | \
|
||||
git-pack-redundant --all | xargs rm
|
||||
git fsck --full --unreachable | cut -d ' ' -f3 | \
|
||||
git pack-redundant --all | xargs rm
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-pack-refs - Pack heads and tags for efficient repository access
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-pack-refs' [--all] [--no-prune]
|
||||
'git pack-refs' [--all] [--no-prune]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -31,7 +31,7 @@ Subsequent updates to branches always creates new file under
|
|||
|
||||
A recommended practice to deal with a repository with too many
|
||||
refs is to pack its refs with `--all --prune` once, and
|
||||
occasionally run `git-pack-refs \--prune`. Tags are by
|
||||
occasionally run `git pack-refs \--prune`. Tags are by
|
||||
definition stationary and are not expected to change. Branch
|
||||
heads will be packed with the initial `pack-refs --all`, but
|
||||
only the currently active branch heads will become unpacked,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-patch-id - Compute unique ID for a patch
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-patch-id' < <patch>
|
||||
'git patch-id' < <patch>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-peek-remote - List the references in a remote repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-peek-remote' [--upload-pack=<git-upload-pack>] [<host>:]<directory>
|
||||
'git peek-remote' [--upload-pack=<git-upload-pack>] [<host>:]<directory>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-prune-packed - Remove extra objects that are already in pack files
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-prune-packed' [-n] [-q]
|
||||
'git prune-packed' [-n] [-q]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ objects specified on the command line, and prunes all unpacked
|
|||
objects unreachable from any of these head objects from the object database.
|
||||
In addition, it
|
||||
prunes the unpacked objects that are also found in packs by
|
||||
running `git prune-packed`.
|
||||
running `git-prune-packed`.
|
||||
|
||||
Note that unreachable, packed objects will remain. If this is
|
||||
not desired, see linkgit:git-repack[1].
|
||||
|
|
@ -53,7 +53,7 @@ borrows from your repository via its
|
|||
`.git/objects/info/alternates`:
|
||||
|
||||
------------
|
||||
$ git prune $(cd ../another && $(git-rev-parse --all))
|
||||
$ git prune $(cd ../another && $(git rev-parse --all))
|
||||
------------
|
||||
|
||||
Notes
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-pull - Fetch from and merge with another repository or a local branch
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-pull' <options> <repository> <refspec>...
|
||||
'git pull' <options> <repository> <refspec>...
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-push' [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
|
||||
'git push' [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
|
||||
[--repo=all] [-f | --force] [-v | --verbose] [<repository> <refspec>...]
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-quiltimport - Applies a quilt patchset onto the current branch
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-quiltimport' [--dry-run] [--author <author>] [--patches <dir>]
|
||||
'git quiltimport' [--dry-run] [--author <author>] [--patches <dir>]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-read-tree' (<tree-ish> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
|
||||
'git read-tree' (<tree-ish> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -127,8 +127,8 @@ given pathname, and the contents of the path matches with the tree
|
|||
being read, the stat info from the index is used. (In other words, the
|
||||
index's stat()s take precedence over the merged tree's).
|
||||
|
||||
That means that if you do a `git-read-tree -m <newtree>` followed by a
|
||||
`git-checkout-index -f -u -a`, the `git-checkout-index` only checks out
|
||||
That means that if you do a `git read-tree -m <newtree>` followed by a
|
||||
`git checkout-index -f -u -a`, the `git-checkout-index` only checks out
|
||||
the stuff that really changed.
|
||||
|
||||
This is used to avoid unnecessary false hits when `git-diff-files` is
|
||||
|
|
@ -138,7 +138,7 @@ run after `git-read-tree`.
|
|||
Two Tree Merge
|
||||
~~~~~~~~~~~~~~
|
||||
|
||||
Typically, this is invoked as `git-read-tree -m $H $M`, where $H
|
||||
Typically, this is invoked as `git read-tree -m $H $M`, where $H
|
||||
is the head commit of the current repository, and $M is the head
|
||||
of a foreign tree, which is simply ahead of $H (i.e. we are in a
|
||||
fast forward situation).
|
||||
|
|
@ -151,7 +151,7 @@ the following:
|
|||
|
||||
2. The user wants to fast-forward to $M.
|
||||
|
||||
In this case, the `git-read-tree -m $H $M` command makes sure
|
||||
In this case, the `git read-tree -m $H $M` command makes sure
|
||||
that no local change is lost as the result of this "merge".
|
||||
Here are the "carry forward" rules:
|
||||
|
||||
|
|
@ -198,13 +198,13 @@ operating under the -u flag.
|
|||
|
||||
When this form of git-read-tree returns successfully, you can
|
||||
see what "local changes" you made are carried forward by running
|
||||
`git-diff-index --cached $M`. Note that this does not
|
||||
necessarily match `git-diff-index --cached $H` would have
|
||||
`git diff-index --cached $M`. Note that this does not
|
||||
necessarily match `git diff-index --cached $H` would have
|
||||
produced before such a two tree merge. This is because of cases
|
||||
18 and 19 --- if you already had the changes in $M (e.g. maybe
|
||||
you picked it up via e-mail in a patch form), `git-diff-index
|
||||
you picked it up via e-mail in a patch form), `git diff-index
|
||||
--cached $H` would have told you about the change before this
|
||||
merge, but it would not show in `git-diff-index --cached $M`
|
||||
merge, but it would not show in `git diff-index --cached $M`
|
||||
output after two-tree merge.
|
||||
|
||||
|
||||
|
|
@ -219,7 +219,7 @@ starts out at 1.
|
|||
This means that you can do
|
||||
|
||||
----------------
|
||||
$ git-read-tree -m <tree1> <tree2> <tree3>
|
||||
$ git read-tree -m <tree1> <tree2> <tree3>
|
||||
----------------
|
||||
|
||||
and you will end up with an index with all of the <tree1> entries in
|
||||
|
|
@ -304,8 +304,8 @@ commit. To illustrate, suppose you start from what has been
|
|||
committed last to your repository:
|
||||
|
||||
----------------
|
||||
$ JC=`git-rev-parse --verify "HEAD^0"`
|
||||
$ git-checkout-index -f -u -a $JC
|
||||
$ JC=`git rev-parse --verify "HEAD^0"`
|
||||
$ git checkout-index -f -u -a $JC
|
||||
----------------
|
||||
|
||||
You do random edits, without running git-update-index. And then
|
||||
|
|
@ -313,7 +313,7 @@ you notice that the tip of your "upstream" tree has advanced
|
|||
since you pulled from him:
|
||||
|
||||
----------------
|
||||
$ git-fetch git://.... linus
|
||||
$ git fetch git://.... linus
|
||||
$ LT=`cat .git/FETCH_HEAD`
|
||||
----------------
|
||||
|
||||
|
|
@ -323,10 +323,10 @@ added or modified index entries since $JC, and if you haven't,
|
|||
then does the right thing. So with the following sequence:
|
||||
|
||||
----------------
|
||||
$ git-read-tree -m -u `git-merge-base $JC $LT` $JC $LT
|
||||
$ git-merge-index git-merge-one-file -a
|
||||
$ git read-tree -m -u `git merge-base $JC $LT` $JC $LT
|
||||
$ git merge-index git-merge-one-file -a
|
||||
$ echo "Merge with Linus" | \
|
||||
git-commit-tree `git-write-tree` -p $JC -p $LT
|
||||
git commit-tree `git write-tree` -p $JC -p $LT
|
||||
----------------
|
||||
|
||||
what you would commit is a pure merge between $JC and $LT without
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ git-rebase - Forward-port local commits to the updated upstream head
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
|
||||
'git rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
|
||||
[-s <strategy> | --strategy=<strategy>]
|
||||
[-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
|
||||
[--onto <newbase>] <upstream> [<branch>]
|
||||
'git-rebase' --continue | --skip | --abort
|
||||
'git rebase' --continue | --skip | --abort
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -52,8 +52,8 @@ Assume the following history exists and the current branch is "topic":
|
|||
From this point, the result of either of the following commands:
|
||||
|
||||
|
||||
git-rebase master
|
||||
git-rebase master topic
|
||||
git rebase master
|
||||
git rebase master topic
|
||||
|
||||
would be:
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ followed by `git rebase master`.
|
|||
|
||||
If the upstream branch already contains a change you have made (e.g.,
|
||||
because you mailed a patch which was applied upstream), then that commit
|
||||
will be skipped. For example, running `git-rebase master` on the
|
||||
will be skipped. For example, running `git rebase master` on the
|
||||
following history (in which A' and A introduce the same set of changes,
|
||||
but have different committer information):
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ got merged into more stable 'master' branch, like this:
|
|||
|
||||
We can get this using the following command:
|
||||
|
||||
git-rebase --onto master next topic
|
||||
git rebase --onto master next topic
|
||||
|
||||
|
||||
Another example of --onto option is to rebase part of a
|
||||
|
|
@ -132,7 +132,7 @@ branch. If we have the following situation:
|
|||
|
||||
then the command
|
||||
|
||||
git-rebase --onto master topicA topicB
|
||||
git rebase --onto master topicA topicB
|
||||
|
||||
would result in:
|
||||
|
||||
|
|
@ -155,7 +155,7 @@ the following situation:
|
|||
|
||||
then the command
|
||||
|
||||
git-rebase --onto topicA~5 topicA~3 topicA
|
||||
git rebase --onto topicA~5 topicA~3 topicA
|
||||
|
||||
would result in the removal of commits F and G:
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ part of topicA. Note that the argument to --onto and the <upstream>
|
|||
parameter can be any valid commit-ish.
|
||||
|
||||
In case of conflict, git-rebase will stop at the first problematic commit
|
||||
and leave conflict markers in the tree. You can use git diff to locate
|
||||
and leave conflict markers in the tree. You can use git-diff to locate
|
||||
the markers (<<<<<<) and make edits to resolve the conflict. For each
|
||||
file you edit, you need to tell git that the conflict has been resolved,
|
||||
typically this would be done with
|
||||
|
|
@ -364,7 +364,7 @@ SPLITTING COMMITS
|
|||
-----------------
|
||||
|
||||
In interactive mode, you can mark commits with the action "edit". However,
|
||||
this does not necessarily mean that 'git rebase' expects the result of this
|
||||
this does not necessarily mean that 'git-rebase' expects the result of this
|
||||
edit to be exactly one commit. Indeed, you can undo the commit, or you can
|
||||
add other commits. This can be used to split a commit into two:
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-receive-pack - Receive what is pushed into the repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-receive-pack' <directory>
|
||||
'git receive-pack' <directory>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -111,10 +111,10 @@ ref listing the commits pushed to the repository:
|
|||
if expr "$oval" : '0*$' >/dev/null
|
||||
then
|
||||
echo "Created a new ref, with the following commits:"
|
||||
git-rev-list --pretty "$nval"
|
||||
git rev-list --pretty "$nval"
|
||||
else
|
||||
echo "New commits:"
|
||||
git-rev-list --pretty "$nval" "^$oval"
|
||||
git rev-list --pretty "$nval" "^$oval"
|
||||
fi |
|
||||
mail -s "Changes to ref $ref" commit-list@mydomain
|
||||
done
|
||||
|
|
@ -140,11 +140,11 @@ The exit code from this hook invocation is ignored; the only thing
|
|||
left for git-receive-pack to do at that point is to exit itself
|
||||
anyway.
|
||||
|
||||
This hook can be used, for example, to run "git-update-server-info"
|
||||
This hook can be used, for example, to run "git update-server-info"
|
||||
if the repository is packed and is served via a dumb transport.
|
||||
|
||||
#!/bin/sh
|
||||
exec git-update-server-info
|
||||
exec git update-server-info
|
||||
|
||||
|
||||
SEE ALSO
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-relink - Hardlink common objects in local repositories
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-relink' [--safe] <dir> [<dir>]\* <master_dir>
|
||||
'git relink' [--safe] <dir> [<dir>]\* <master_dir>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ git-remote - manage set of tracked repositories
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-remote' [-v | --verbose]
|
||||
'git-remote' add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>
|
||||
'git-remote' rm <name>
|
||||
'git-remote' show [-n] <name>
|
||||
'git-remote' prune [-n | --dry-run] <name>
|
||||
'git-remote' update [group]
|
||||
'git remote' [-v | --verbose]
|
||||
'git remote' add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>
|
||||
'git remote' rm <name>
|
||||
'git remote' show [-n] <name>
|
||||
'git remote' prune [-n | --dry-run] <name>
|
||||
'git remote' update [group]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-repack - Pack unpacked objects in a repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]
|
||||
'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -55,20 +55,20 @@ OPTIONS
|
|||
Also runs linkgit:git-prune-packed[1].
|
||||
|
||||
-l::
|
||||
Pass the `--local` option to `git pack-objects`, see
|
||||
Pass the `--local` option to `git-pack-objects`, see
|
||||
linkgit:git-pack-objects[1].
|
||||
|
||||
-f::
|
||||
Pass the `--no-reuse-delta` option to `git pack-objects`, see
|
||||
Pass the `--no-reuse-delta` option to `git-pack-objects`, see
|
||||
linkgit:git-pack-objects[1].
|
||||
|
||||
-q::
|
||||
Pass the `-q` option to `git pack-objects`, see
|
||||
Pass the `-q` option to `git-pack-objects`, see
|
||||
linkgit:git-pack-objects[1].
|
||||
|
||||
-n::
|
||||
Do not update the server information with
|
||||
`git update-server-info`. This option skips
|
||||
`git-update-server-info`. This option skips
|
||||
updating local catalog files needed to publish
|
||||
this repository (or a direct copy of it)
|
||||
over HTTP or FTP. See gitlink:git-update-server-info[1].
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-repo-config - Get and set repository or global options
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-repo-config' ...
|
||||
'git repo-config' ...
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-request-pull - Generates a summary of pending changes
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-request-pull' <start> <url> [<end>]
|
||||
'git request-pull' <start> <url> [<end>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-rerere' [clear|diff|status|gc]
|
||||
'git rerere' [clear|diff|status|gc]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -198,7 +198,7 @@ you could run `git rebase master topic`, to keep yourself
|
|||
up-to-date even before your topic is ready to be sent upstream.
|
||||
This would result in falling back to three-way merge, and it
|
||||
would conflict the same way the test merge you resolved earlier.
|
||||
`git-rerere` is run by `git rebase` to help you resolve this
|
||||
`git-rerere` is run by `git-rebase` to help you resolve this
|
||||
conflict.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ stop at that point. Their parents are implied. Thus the following
|
|||
command:
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
$ git-rev-list foo bar ^baz
|
||||
$ git rev-list foo bar ^baz
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
means "list all the commits which are included in 'foo' and 'bar', but
|
||||
|
|
@ -70,8 +70,8 @@ short-hand for "{caret}'<commit1>' '<commit2>'". For example, either of
|
|||
the following may be used interchangeably:
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
$ git-rev-list origin..HEAD
|
||||
$ git-rev-list HEAD ^origin
|
||||
$ git rev-list origin..HEAD
|
||||
$ git rev-list HEAD ^origin
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
Another special notation is "'<commit1>'...'<commit2>'" which is useful
|
||||
|
|
@ -79,8 +79,8 @@ for merges. The resulting set of commits is the symmetric difference
|
|||
between the two operands. The following two commands are equivalent:
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
$ git-rev-list A B --not $(git-merge-base --all A B)
|
||||
$ git-rev-list A...B
|
||||
$ git rev-list A B --not $(git merge-base --all A B)
|
||||
$ git rev-list A...B
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
linkgit:git-rev-list[1] is a very essential git program, since it
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-rev-parse - Pick out and massage parameters
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-rev-parse' [ --option ] <args>...
|
||||
'git rev-parse' [ --option ] <args>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -296,7 +296,7 @@ reachable from `r1` from the set of commits reachable from
|
|||
|
||||
A similar notation "`r1\...r2`" is called symmetric difference
|
||||
of `r1` and `r2` and is defined as
|
||||
"`r1 r2 --not $(git-merge-base --all r1 r2)`".
|
||||
"`r1 r2 --not $(git merge-base --all r1 r2)`".
|
||||
It is the set of commits that are reachable from either one of
|
||||
`r1` or `r2` but not from both.
|
||||
|
||||
|
|
@ -384,7 +384,7 @@ bar= some cool option --bar with an argument
|
|||
An option group Header
|
||||
C? option C with an optional argument"
|
||||
|
||||
eval `echo "$OPTS_SPEC" | git-rev-parse --parseopt -- "$@" || echo exit $?`
|
||||
eval `echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?`
|
||||
------------
|
||||
|
||||
EXAMPLES
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ git-revert - Revert an existing commit
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>
|
||||
'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@ git-rm - Remove files from the working tree and from the index
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
|
||||
'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Remove files from the index, or from the working tree and the index.
|
||||
`git rm` will not remove a file from just your working directory.
|
||||
`git-rm` will not remove a file from just your working directory.
|
||||
(There is no option to remove a file only from the work tree
|
||||
and yet keep it in the index; use `/bin/rm` if you want to do that.)
|
||||
The files being removed have to be identical to the tip of the branch,
|
||||
|
|
@ -82,7 +82,7 @@ also remove all of directory `d2`.
|
|||
|
||||
EXAMPLES
|
||||
--------
|
||||
git-rm Documentation/\\*.txt::
|
||||
git rm Documentation/\\*.txt::
|
||||
Removes all `\*.txt` files from the index that are under the
|
||||
`Documentation` directory and any of its subdirectories.
|
||||
+
|
||||
|
|
@ -90,7 +90,7 @@ Note that the asterisk `\*` is quoted from the shell in this
|
|||
example; this lets git, and not the shell, expand the pathnames
|
||||
of files and subdirectories under the `Documentation/` directory.
|
||||
|
||||
git-rm -f git-*.sh::
|
||||
git rm -f git-*.sh::
|
||||
Because this example lets the shell expand the asterisk
|
||||
(i.e. you are listing the files explicitly), it
|
||||
does not remove `subdir/git-foo.sh`.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-send-email - Send a collection of patches as emails
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-send-email' [options] <file|directory> [... file|directory]
|
||||
'git send-email' [options] <file|directory> [... file|directory]
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-send-pack - Push objects over git protocol to another repository
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
|
||||
'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ git-shortlog - Summarize 'git log' output
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] [-w]
|
||||
git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>...]
|
||||
git log --pretty=short | 'git shortlog' [-h] [-n] [-s] [-e] [-w]
|
||||
git shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Summarizes 'git log' output in a format suitable for inclusion
|
||||
Summarizes 'git-log' output in a format suitable for inclusion
|
||||
in release announcements. Each commit will be grouped by author and
|
||||
the first line of the commit message will be shown.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ git-show-branch - Show branches and their commits
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-show-branch' [--all] [--remotes] [--topo-order] [--current]
|
||||
'git show-branch' [--all] [--remotes] [--topo-order] [--current]
|
||||
[--more=<n> | --list | --independent | --merge-base]
|
||||
[--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
|
||||
'git-show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]
|
||||
'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-show-index - Show packed archive index
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-show-index' < idx-file
|
||||
'git show-index' < idx-file
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ git-show-ref - List references in a local repository
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git-show-ref' [-q|--quiet] [--verify] [-h|--head] [-d|--dereference]
|
||||
'git show-ref' [-q|--quiet] [--verify] [-h|--head] [-d|--dereference]
|
||||
[-s|--hash] [--abbrev] [--tags] [--heads] [--] <pattern>...
|
||||
'git-show-ref' --exclude-existing[=pattern]
|
||||
'git show-ref' --exclude-existing[=pattern]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -144,7 +144,7 @@ For scripting, you can ask it to be quiet with the "--quiet" flag, which
|
|||
allows you to do things like
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
git-show-ref --quiet --verify -- "refs/heads/$headname" ||
|
||||
git show-ref --quiet --verify -- "refs/heads/$headname" ||
|
||||
echo "$headname is not a valid branch"
|
||||
-----------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-show - Show various types of objects
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-show' [options] <object>...
|
||||
'git show' [options] <object>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче