mirror of https://github.com/git/git.git
Big tool rename.
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
parent
99977bd5fd
commit
215a7ad1ef
|
|
@ -1,28 +1,28 @@
|
|||
git-apply
|
||||
git-build-rev-cache
|
||||
git-cat-file
|
||||
git-checkout-cache
|
||||
git-checkout-index
|
||||
git-clone-pack
|
||||
git-commit-tree
|
||||
git-convert-cache
|
||||
git-convert-objects
|
||||
git-daemon
|
||||
git-diff-cache
|
||||
git-diff-index
|
||||
git-diff-files
|
||||
git-diff-helper
|
||||
git-diff-stages
|
||||
git-diff-tree
|
||||
git-export
|
||||
git-fetch-pack
|
||||
git-fsck-cache
|
||||
git-fsck-objects
|
||||
git-get-tar-commit-id
|
||||
git-hash-object
|
||||
git-http-pull
|
||||
git-http-fetch
|
||||
git-init-db
|
||||
git-local-pull
|
||||
git-local-fetch
|
||||
git-ls-files
|
||||
git-ls-tree
|
||||
git-merge-base
|
||||
git-merge-cache
|
||||
git-merge-index
|
||||
git-mktag
|
||||
git-pack-objects
|
||||
git-patch-id
|
||||
|
|
@ -37,13 +37,13 @@ git-send-pack
|
|||
git-show-branch
|
||||
git-show-index
|
||||
git-show-rev-cache
|
||||
git-ssh-pull
|
||||
git-ssh-push
|
||||
git-ssh-fetch
|
||||
git-ssh-upload
|
||||
git-stripspace
|
||||
git-tar-tree
|
||||
git-unpack-file
|
||||
git-unpack-objects
|
||||
git-update-cache
|
||||
git-update-index
|
||||
git-update-server-info
|
||||
git-upload-pack
|
||||
git-var
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
The output format from "git-diff-cache", "git-diff-tree" and
|
||||
The output format from "git-diff-index", "git-diff-tree" and
|
||||
"git-diff-files" are very similar.
|
||||
|
||||
These commands all compare two sets of things; what are
|
||||
compared are different:
|
||||
|
||||
git-diff-cache <tree-ish>::
|
||||
git-diff-index <tree-ish>::
|
||||
compares the <tree-ish> and the files on the filesystem.
|
||||
|
||||
git-diff-cache --cached <tree-ish>::
|
||||
git-diff-index --cached <tree-ish>::
|
||||
compares the <tree-ish> and the cache.
|
||||
|
||||
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
|
||||
|
|
@ -58,7 +58,7 @@ Example:
|
|||
Generating patches with -p
|
||||
--------------------------
|
||||
|
||||
When "git-diff-cache", "git-diff-tree", or "git-diff-files" are run
|
||||
When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
|
||||
with a '-p' option, they do not produce the output described above;
|
||||
instead they produce a patch file.
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ The "diff" formatting options can be customized via the
|
|||
environment variable 'GIT_DIFF_OPTS'. For example, if you
|
||||
prefer context diff:
|
||||
|
||||
GIT_DIFF_OPTS=-c git-diff-cache -p $(cat .git/HEAD)
|
||||
GIT_DIFF_OPTS=-c git-diff-index -p $(cat .git/HEAD)
|
||||
|
||||
|
||||
2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ June 2005
|
|||
Introduction
|
||||
------------
|
||||
|
||||
The diff commands git-diff-cache, git-diff-files, and
|
||||
The diff commands git-diff-index, git-diff-files, and
|
||||
git-diff-tree can be told to manipulate differences they find
|
||||
in unconventional ways before showing diff(1) output. The
|
||||
manipulation is collectively called "diffcore transformation".
|
||||
|
|
@ -21,7 +21,7 @@ The chain of operation
|
|||
The git-diff-* family works by first comparing two sets of
|
||||
files:
|
||||
|
||||
- git-diff-cache compares contents of a "tree" object and the
|
||||
- git-diff-index compares contents of a "tree" object and the
|
||||
working directory (when '--cached' flag is not used) or a
|
||||
"tree" object and the index file (when '--cached' flag is
|
||||
used);
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
git-add-script(1)
|
||||
=================
|
||||
git-add(1)
|
||||
==========
|
||||
|
||||
NAME
|
||||
----
|
||||
git-add-script - Add files to the cache.
|
||||
git-add - Add files to the cache.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-add-script' <file>...
|
||||
'git-add' <file>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
A simple wrapper to git-update-cache to add files to the cache for people used
|
||||
A simple wrapper to git-update-index to add files to the cache for people used
|
||||
to do "cvs add".
|
||||
|
||||
OPTIONS
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
git-archimport-script(1)
|
||||
========================
|
||||
git-archimport(1)
|
||||
=================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-archimport-script - Import an arch repository into git
|
||||
git-archimport - Import an arch repository into git
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
`git-archimport-script` [--option...] <args>
|
||||
`git-archimport` [--option...] <args>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
git-bisect-script(1)
|
||||
====================
|
||||
git-bisect(1)
|
||||
=============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-bisect-script - Find the change that introduced a bug
|
||||
git-bisect - Find the change that introduced a bug
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-branch-script(1)
|
||||
====================
|
||||
git-branch(1)
|
||||
=============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-branch-script - Create a new branch.
|
||||
git-branch - Create a new branch.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-branch-script' [<branchname> [start-point]]
|
||||
'git-branch' [<branchname> [start-point]]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-checkout-cache(1)
|
||||
git-checkout-index(1)
|
||||
=====================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-checkout-cache - Copy files from the cache to the working directory
|
||||
git-checkout-index - Copy files from the cache to the working directory
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-checkout-cache' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
|
||||
'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
|
||||
[--] <file>...
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -46,21 +46,21 @@ OPTIONS
|
|||
|
||||
Note that the order of the flags matters:
|
||||
|
||||
git-checkout-cache -a -f file.c
|
||||
git-checkout-index -a -f file.c
|
||||
|
||||
will first check out all files listed in the cache (but not overwrite
|
||||
any old ones), and then force-checkout `file.c` a second time (ie that
|
||||
one *will* overwrite any old contents with the same filename).
|
||||
|
||||
Also, just doing "git-checkout-cache" does nothing. You probably meant
|
||||
"git-checkout-cache -a". And if you want to force it, you want
|
||||
"git-checkout-cache -f -a".
|
||||
Also, 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" thing is that from scripts you are
|
||||
supposed to be able to do things like:
|
||||
|
||||
find . -name '*.h' -print0 | xargs -0 git-checkout-cache -f --
|
||||
find . -name '*.h' -print0 | xargs -0 git-checkout-index -f --
|
||||
|
||||
which will force all existing `*.h` files to be replaced with their
|
||||
cached copies. If an empty command line implied "all", then this would
|
||||
|
|
@ -68,7 +68,7 @@ force-refresh everything in the cache, which was not the point.
|
|||
|
||||
To update and refresh only the files already checked out:
|
||||
|
||||
git-checkout-cache -n -f -a && git-update-cache --ignore-missing --refresh
|
||||
git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
|
||||
|
||||
Oh, and the "--" is just a good idea when you know the rest will be
|
||||
filenames. Just so that you wouldn't have a filename of "-a" causing
|
||||
|
|
@ -76,18 +76,18 @@ problems (not possible in the above example, but get used to it in
|
|||
scripting!).
|
||||
|
||||
The prefix ability basically makes it trivial to use
|
||||
git-checkout-cache as an "export as tree" function. Just read the
|
||||
git-checkout-index as an "export as tree" function. Just read the
|
||||
desired tree into the index, and do a
|
||||
|
||||
git-checkout-cache --prefix=git-export-dir/ -a
|
||||
git-checkout-index --prefix=git-export-dir/ -a
|
||||
|
||||
and git-checkout-cache will "export" the cache into the specified
|
||||
and git-checkout-index will "export" the cache into the specified
|
||||
directory.
|
||||
|
||||
NOTE The final "/" is important. The exported name is literally just
|
||||
prefixed with the specified string, so you can also do something like
|
||||
|
||||
git-checkout-cache --prefix=.merged- Makefile
|
||||
git-checkout-index --prefix=.merged- Makefile
|
||||
|
||||
to check out the currently cached copy of `Makefile` into the file
|
||||
`.merged-Makefile`
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-checkout-script(1)
|
||||
======================
|
||||
git-checkout(1)
|
||||
===============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-checkout-script - Checkout and switch to a branch.
|
||||
git-checkout - Checkout and switch to a branch.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-checkout-script' [-f] [-b <new_branch>] [<branch>]
|
||||
'git-checkout' [-f] [-b <new_branch>] [<branch>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
git-cherry-pick-script(1)
|
||||
=========================
|
||||
git-cherry-pick(1)
|
||||
==================
|
||||
v0.99.5 Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-cherry-pick-script - Apply the change introduced by an existing commit.
|
||||
git-cherry-pick - Apply the change introduced by an existing commit.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-cherry-pick-script' [-n] [-r] <commit>
|
||||
'git-cherry-pick' [-n] [-r] <commit>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
git-clone-script(1)
|
||||
===================
|
||||
git-clone(1)
|
||||
============
|
||||
v0.1, July 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-clone-script - Clones a repository.
|
||||
git-clone - Clones a repository.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
git-commit-script(1)
|
||||
====================
|
||||
git-commit(1)
|
||||
=============
|
||||
v0.99.4, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-commit-script - Record your changes
|
||||
git-commit - Record your changes
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-convert-cache(1)
|
||||
====================
|
||||
git-convert-objects(1)
|
||||
======================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-convert-cache - Converts old-style GIT repository
|
||||
git-convert-objects - Converts old-style GIT repository
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-convert-cache'
|
||||
'git-convert-objects'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-count-objects-script(1)
|
||||
===========================
|
||||
git-count-objects(1)
|
||||
====================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-count-objects-script - Reports on unpacked objects.
|
||||
git-count-objects - Reports on unpacked objects.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-count-objects-script'
|
||||
'git-count-objects'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-cvsimport-script(1)
|
||||
=======================
|
||||
git-cvsimport(1)
|
||||
================
|
||||
v0.1, July 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-cvsimport-script - Import a CVS repository into git
|
||||
git-cvsimport - Import a CVS repository into git
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
|
||||
'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
|
||||
[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
|
||||
[ -C <GIT_repository> ] [ -i ] [ -k ]
|
||||
[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
|
||||
|
|
@ -16,7 +16,7 @@ DESCRIPTION
|
|||
Compares the files in the working tree and the cache. When paths
|
||||
are specified, compares only those named paths. Otherwise all
|
||||
entries in the cache are compared. The output format is the
|
||||
same as "git-diff-cache" and "git-diff-tree".
|
||||
same as "git-diff-index" and "git-diff-tree".
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ SYNOPSIS
|
|||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Reads output from "git-diff-cache", "git-diff-tree" and "git-diff-files" and
|
||||
Reads output from "git-diff-index", "git-diff-tree" and "git-diff-files" and
|
||||
generates patch format output.
|
||||
|
||||
OPTIONS
|
||||
|
|
@ -35,7 +35,7 @@ OPTIONS
|
|||
|
||||
See Also
|
||||
--------
|
||||
The section on generating patches in link:git-diff-cache.html[git-diff-cache]
|
||||
The section on generating patches in link:git-diff-index.html[git-diff-index]
|
||||
|
||||
|
||||
Author
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
git-diff-cache(1)
|
||||
git-diff-index(1)
|
||||
=================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-diff-cache - Compares content and mode of blobs between the cache and repository
|
||||
git-diff-index - Compares content and mode of blobs between the cache and repository
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-diff-cache' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
|
||||
'git-diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -32,7 +32,7 @@ include::diff-options.txt[]
|
|||
-m::
|
||||
By default, files recorded in the index but not checked
|
||||
out are reported as deleted. This flag makes
|
||||
"git-diff-cache" say that all non-checked-out files are up
|
||||
"git-diff-index" say that all non-checked-out files are up
|
||||
to date.
|
||||
|
||||
Output format
|
||||
|
|
@ -58,24 +58,24 @@ some files in the cache and are ready to commit. You want to see eactly
|
|||
*what* you are going to commit is without having to write a new tree
|
||||
object and compare it that way, and to do that, you just do
|
||||
|
||||
git-diff-cache --cached $(cat .git/HEAD)
|
||||
git-diff-index --cached $(cat .git/HEAD)
|
||||
|
||||
Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had
|
||||
done an "git-update-cache" to make that effective in the index file.
|
||||
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
|
||||
matches my working directory. But doing a "git-diff-cache" does:
|
||||
matches my working directory. But doing a "git-diff-index" does:
|
||||
|
||||
torvalds@ppc970:~/git> git-diff-cache --cached $(cat .git/HEAD)
|
||||
torvalds@ppc970:~/git> git-diff-index --cached $(cat .git/HEAD)
|
||||
-100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c
|
||||
+100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c
|
||||
|
||||
You can trivially see that the above is a rename.
|
||||
|
||||
In fact, "git-diff-cache --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.
|
||||
|
||||
So doing a "git-diff-cache --cached" is basically very useful when you are
|
||||
So doing a "git-diff-index --cached" is basically very useful when you are
|
||||
asking yourself "what have I already marked for being committed, and
|
||||
what's the difference to a previous tree".
|
||||
|
||||
|
|
@ -96,10 +96,10 @@ output to a tee, but with a twist.
|
|||
The twist is that if some file doesn't match the cache, we don't have
|
||||
a backing store thing for it, and we use the magic "all-zero" sha1 to
|
||||
show that. So let's say that you have edited `kernel/sched.c`, but
|
||||
have not actually done a "git-update-cache" on it yet - there is no
|
||||
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-cache $(cat .git/HEAD )
|
||||
torvalds@ppc970:~/v2.6/linux> git-diff-index $(cat .git/HEAD )
|
||||
*100644->100664 blob 7476bb......->000000...... kernel/sched.c
|
||||
|
||||
ie it shows that the tree has changed, and that `kernel/sched.c` has is
|
||||
|
|
@ -107,7 +107,7 @@ not up-to-date and may contain new stuff. The all-zero sha1 means that to
|
|||
get the real diff, you need to look at the object in the working directory
|
||||
directly rather than do an object-to-object diff.
|
||||
|
||||
NOTE! As with other commands of this type, "git-diff-cache" does not
|
||||
NOTE! As with other commands of this type, "git-diff-index" does not
|
||||
actually look at the contents of the file at all. So maybe
|
||||
`kernel/sched.c` hasn't actually changed, and it's just that you
|
||||
touched it. In either case, it's a note that you need to
|
||||
|
|
@ -93,7 +93,7 @@ so it can be used to name subdirectories.
|
|||
An example of normal usage is:
|
||||
|
||||
torvalds@ppc970:~/git> git-diff-tree 5319e4......
|
||||
*100664->100664 blob ac348b.......->a01513....... git-fsck-cache.c
|
||||
*100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c
|
||||
|
||||
which tells you that the last commit changed just one file (it's from
|
||||
this one:
|
||||
|
|
@ -104,7 +104,7 @@ this one:
|
|||
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
|
||||
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
|
||||
|
||||
Make "git-fsck-cache" print out all the root commits it finds.
|
||||
Make "git-fsck-objects" print out all the root commits it finds.
|
||||
|
||||
Once I do the reference tracking, I'll also make it print out all the
|
||||
HEAD commits it finds, which is even more interesting.
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
git-diff-script(1)
|
||||
==================
|
||||
git-diff(1)
|
||||
===========
|
||||
|
||||
NAME
|
||||
----
|
||||
git-diff-script - Some git command not yet documented.
|
||||
git-diff - Some git command not yet documented.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-diff-script' [ --option ] <args>...
|
||||
'git-diff' [ --option ] <args>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-fetch-script(1)
|
||||
===================
|
||||
git-fetch(1)
|
||||
============
|
||||
v0.99.5, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-fetch-script - Download objects and a head from another repository.
|
||||
git-fetch - Download objects and a head from another repository.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-fetch-script' <repository> <refspec>...
|
||||
'git-fetch' <repository> <refspec>...
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
git-format-patch-script(1)
|
||||
==========================
|
||||
git-format-patch(1)
|
||||
===================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-format-patch-script - Some git command not yet documented.
|
||||
git-format-patch - Some git command not yet documented.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-format-patch-script' [ --option ] <args>...
|
||||
'git-format-patch' [ --option ] <args>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-fsck-cache(1)
|
||||
=================
|
||||
git-fsck-objects(1)
|
||||
===================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-fsck-cache - Verifies the connectivity and validity of the objects in the database
|
||||
git-fsck-objects - Verifies the connectivity and validity of the objects in the database
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-fsck-cache' [--tags] [--root] [--unreachable] [--cache] [--standalone | --full] [--strict] [<object>*]
|
||||
'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache] [--standalone | --full] [--strict] [<object>*]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -20,7 +20,7 @@ OPTIONS
|
|||
<object>::
|
||||
An object to treat as the head of an unreachability trace.
|
||||
|
||||
If no objects are given, git-fsck-cache defaults to using the
|
||||
If no objects are given, git-fsck-objects defaults to using the
|
||||
index file and all SHA1 references in .git/refs/* as heads.
|
||||
|
||||
--unreachable::
|
||||
|
|
@ -69,11 +69,11 @@ that aren't readable from any of the specified head nodes.
|
|||
|
||||
So for example
|
||||
|
||||
git-fsck-cache --unreachable $(cat .git/HEAD .git/refs/heads/*)
|
||||
git-fsck-objects --unreachable $(cat .git/HEAD .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
|
||||
sorted properly etc), but on the whole if "git-fsck-cache" is happy, you
|
||||
sorted properly etc), but on the whole if "git-fsck-objects" is happy, you
|
||||
do have a valid tree.
|
||||
|
||||
Any corrupt objects you will have to find in backups or other archives
|
||||
|
|
@ -111,7 +111,7 @@ dangling <type> <object>::
|
|||
The <type> object <object>, is present in the database but never
|
||||
'directly' used. A dangling commit could be a root node.
|
||||
|
||||
warning: git-fsck-cache: tree <tree> has full pathnames in it::
|
||||
warning: git-fsck-objects: tree <tree> has full pathnames in it::
|
||||
And it shouldn't...
|
||||
|
||||
sha1 mismatch <object>::
|
||||
|
|
@ -17,7 +17,7 @@ Computes the object ID value for an object with specified type
|
|||
with the contents of the named file (which can be outside of the
|
||||
work tree), and optionally writes the resulting object into the
|
||||
object database. Reports its object ID to its standard output.
|
||||
This is used by "git-cvsimport-script" to update the cache
|
||||
This is used by "git-cvsimport" to update the cache
|
||||
without modifying files in the work tree. When <type> is not
|
||||
specified, it defaults to "blob".
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
git-http-pull(1)
|
||||
================
|
||||
git-http-fetch(1)
|
||||
=================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-http-pull - Downloads a remote GIT repository via HTTP
|
||||
git-http-fetch - Downloads a remote GIT repository via HTTP
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-http-pull' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url
|
||||
'git-http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-local-pull(1)
|
||||
=================
|
||||
git-local-fetch(1)
|
||||
==================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-local-pull - Duplicates another GIT repository on a local system
|
||||
git-local-fetch - Duplicates another GIT repository on a local system
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-local-pull' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path
|
||||
'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
git-log-script(1)
|
||||
=================
|
||||
git-log(1)
|
||||
==========
|
||||
v0.99.4, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-log-script - Show commit logs
|
||||
git-log - Show commit logs
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
git-ls-remote-script(1)
|
||||
=======================
|
||||
git-ls-remote(1)
|
||||
================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-ls-remote-script - Look at references other repository has.
|
||||
git-ls-remote - Look at references other repository has.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-merge-cache(1)
|
||||
git-merge-index(1)
|
||||
==================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-merge-cache - Runs a merge for files needing merging
|
||||
git-merge-index - Runs a merge for files needing merging
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-merge-cache' [-o] [-q] <merge-program> (-a | -- | <file>\*)
|
||||
'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -37,14 +37,14 @@ OPTIONS
|
|||
failure usually indicates conflicts during merge). This is for
|
||||
porcelains which might want to emit custom messages.
|
||||
|
||||
If "git-merge-cache" is called with multiple <file>s (or -a) then it
|
||||
If "git-merge-index" is called with multiple <file>s (or -a) then it
|
||||
processes them in turn only stopping if merge returns a non-zero exit
|
||||
code.
|
||||
|
||||
Typically this is run with the a script calling the merge command from
|
||||
the RCS package.
|
||||
|
||||
A sample script called "git-merge-one-file-script" is included in the
|
||||
A sample script called "git-merge-one-file" is included in the
|
||||
distribution.
|
||||
|
||||
ALERT ALERT ALERT! The git "merge object order" is different from the
|
||||
|
|
@ -54,7 +54,7 @@ original is first. But the argument order to the 3-way merge program
|
|||
|
||||
Examples:
|
||||
|
||||
torvalds@ppc970:~/merge-test> git-merge-cache 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
|
||||
|
|
@ -62,17 +62,17 @@ Examples:
|
|||
|
||||
or
|
||||
|
||||
torvalds@ppc970:~/merge-test> git-merge-cache 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.
|
||||
This is added AA in the branch B.
|
||||
fatal: merge program failed
|
||||
|
||||
where the latter example shows how "git-merge-cache" will stop trying to
|
||||
where the latter example shows how "git-merge-index" will stop trying to
|
||||
merge once anything has returned an error (ie "cat" returned an error
|
||||
for the AA file, because it didn't exist in the original, and thus
|
||||
"git-merge-cache" didn't even try to merge the MM thing).
|
||||
"git-merge-index" didn't even try to merge the MM thing).
|
||||
|
||||
Author
|
||||
------
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
git-merge-one-file-script(1)
|
||||
============================
|
||||
git-merge-one-file(1)
|
||||
=====================
|
||||
v0.99.4, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-merge-one-file-script - The standard helper program to use with "git-merge-cache"
|
||||
git-merge-one-file - The standard helper program to use with "git-merge-index"
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-merge-one-file-script'
|
||||
'git-merge-one-file'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This is the standard helper program to use with "git-merge-cache"
|
||||
This is the standard helper program to use with "git-merge-index"
|
||||
to resolve a merge after the trivial merge done with "git-read-tree -m".
|
||||
|
||||
Author
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
git-octopus-script(1)
|
||||
=====================
|
||||
git-octopus(1)
|
||||
==============
|
||||
v0.99.5, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-octopus-script - Merge more than two commits.
|
||||
git-octopus - Merge more than two commits.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
@ -76,7 +76,7 @@ Documentation by Junio C Hamano
|
|||
|
||||
See-Also
|
||||
--------
|
||||
git-repack-script(1) git-prune-packed(1)
|
||||
git-repack(1) git-prune-packed(1)
|
||||
|
||||
GIT
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
git-parse-remote-script(1)
|
||||
==========================
|
||||
git-parse-remote(1)
|
||||
===================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-parse-remote-script - Routines to help parsing $GIT_DIR/remotes/
|
||||
git-parse-remote - Routines to help parsing $GIT_DIR/remotes/
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'. git-parse-remote-script'
|
||||
'. git-parse-remote'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -34,7 +34,7 @@ Documentation by Ryan Anderson <ryan@michonline.com>
|
|||
|
||||
See-Also
|
||||
--------
|
||||
git-pack-objects(1) git-repack-script(1)
|
||||
git-pack-objects(1) git-repack(1)
|
||||
|
||||
GIT
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
git-prune-script(1)
|
||||
===================
|
||||
git-prune(1)
|
||||
============
|
||||
v0.99.5, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-prune-script - Prunes all unreachable objects from the object database
|
||||
git-prune - Prunes all unreachable objects from the object database
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-prune-script' [-n]
|
||||
'git-prune' [-n]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
||||
This runs `git-fsck-cache --unreachable` using the heads
|
||||
This runs `git-fsck-objects --unreachable` using the heads
|
||||
specified on the command line (or `$GIT_DIR/refs/heads/\*` and
|
||||
`$GIT_DIR/refs/tags/\*` if none is specified), and prunes all
|
||||
unreachable objects from the object database. In addition, it
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
git-pull-script(1)
|
||||
==================
|
||||
git-pull(1)
|
||||
===========
|
||||
v0.99.4, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-pull-script - Pull and merge from another repository.
|
||||
git-pull - Pull and merge from another repository.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-pull-script' <repository> <refspec>...
|
||||
'git-pull' <repository> <refspec>...
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Runs 'git-fetch-script' with the given parameters.
|
||||
Runs 'git-fetch' with the given parameters.
|
||||
|
||||
When only one ref is downloaded, runs 'git resolve' to merge it
|
||||
into the local HEAD. Otherwise uses 'git octopus' to merge them
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
git-push-script(1)
|
||||
==================
|
||||
git-push(1)
|
||||
===========
|
||||
|
||||
NAME
|
||||
----
|
||||
git-push-script - Update remote refs along with associated objects.
|
||||
git-push - Update remote refs along with associated objects.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-push-script' [--all] [--force] <repository> <refspec>...
|
||||
'git-push' [--all] [--force] <repository> <refspec>...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -16,7 +16,7 @@ DESCRIPTION
|
|||
-----------
|
||||
Reads the tree information given by <tree-ish> into the directory cache,
|
||||
but does not actually *update* any of the files it "caches". (see:
|
||||
git-checkout-cache)
|
||||
git-checkout-index)
|
||||
|
||||
Optionally, it can merge a tree into the cache, perform a
|
||||
fast-forward (i.e. 2-way) merge, or a 3-way merge, with the -m
|
||||
|
|
@ -56,7 +56,7 @@ being read, the stat info from the cache is used. (In other words, the
|
|||
cache'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-cache -f -u -a", the "git-checkout-cache" only checks out
|
||||
"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
|
||||
|
|
@ -126,13 +126,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-cache --cached $M". Note that this does not
|
||||
necessarily match "git-diff-cache --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-cache
|
||||
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-cache --cached $M"
|
||||
merge, but it would not show in "git-diff-index --cached $M"
|
||||
output after two-tree merge.
|
||||
|
||||
|
||||
|
|
@ -205,8 +205,8 @@ populated. Here is an outline of how the algorithm works:
|
|||
matching "stage1" entry if it exists too. .. all the normal
|
||||
trivial rules ..
|
||||
|
||||
You would normally use "git-merge-cache" with supplied
|
||||
"git-merge-one-file-script" to do this last step. The script
|
||||
You would normally use "git-merge-index" with supplied
|
||||
"git-merge-one-file" to do this last step. The script
|
||||
does not touch the files in the work tree, and the entire merge
|
||||
happens in the index file. In other words, there is no need to
|
||||
worry about what is in the working directory, since it is never
|
||||
|
|
@ -225,13 +225,13 @@ changes. To illustrate, suppose you start from what has been
|
|||
commited last to your repository:
|
||||
|
||||
$ JC=`cat .git/HEAD`
|
||||
$ git-checkout-cache -f -u -a $JC
|
||||
$ git-checkout-index -f -u -a $JC
|
||||
|
||||
You do random edits, without running git-update-cache. And then
|
||||
You do random edits, without running git-update-index. And then
|
||||
you notice that the tip of your "upstream" tree has advanced
|
||||
since you pulled from him:
|
||||
|
||||
$ git-fetch-script rsync://.... linus
|
||||
$ git-fetch rsync://.... linus
|
||||
$ LT=`cat .git/MERGE_HEAD`
|
||||
|
||||
Your work tree is still based on your HEAD ($JC), but you have
|
||||
|
|
@ -240,7 +240,7 @@ added or modified cache 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-cache git-merge-one-file-script -a
|
||||
$ git-merge-index git-merge-one-file -a
|
||||
$ echo "Merge with Linus" | \
|
||||
git-commit-tree `git-write-tree` -p $JC -p $LT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
git-rebase-script(1)
|
||||
====================
|
||||
git-rebase(1)
|
||||
=============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-rebase-script - Rebase local commits to new upstream head.
|
||||
git-rebase - Rebase local commits to new upstream head.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-rebase-script' <upstream> [<head>]
|
||||
'git-rebase' <upstream> [<head>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-relink-script(1)
|
||||
====================
|
||||
git-relink(1)
|
||||
=============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-relink-script - Hardlink common objects in local repositories.
|
||||
git-relink - Hardlink common objects in local repositories.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-relink-script' [--safe] <dir> <dir> [<dir>]\*
|
||||
'git-relink' [--safe] <dir> <dir> [<dir>]\*
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-rename-script(1)
|
||||
====================
|
||||
git-rename(1)
|
||||
=============
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-rename-script - Script used to rename a file, directory or symlink.
|
||||
git-rename - Script used to rename a file, directory or symlink.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-rename-script' <source> <destination>
|
||||
'git-rename' <source> <destination>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
git-repack-script(1)
|
||||
====================
|
||||
git-repack(1)
|
||||
=============
|
||||
v0.99.5, August 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-repack-script - Script used to pack a repository from a collection of
|
||||
git-repack - Script used to pack a repository from a collection of
|
||||
objects into pack files.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-repack-script' [-a] [-d]
|
||||
'git-repack' [-a] [-d]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-request-pull-script(1)
|
||||
==========================
|
||||
git-request-pull(1)
|
||||
===================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-request-pull-script - Generates a summary of pending changes.
|
||||
git-request-pull - Generates a summary of pending changes.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-request-pull-script' <start> <url> [<end>]
|
||||
'git-request-pull' <start> <url> [<end>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-reset-script(1)
|
||||
===================
|
||||
git-reset(1)
|
||||
============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-reset-script - Reset current HEAD to the specified state.
|
||||
git-reset - Reset current HEAD to the specified state.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-reset-script' [--mixed | --soft | --hard] [<commit-ish>]
|
||||
'git-reset' [--mixed | --soft | --hard] [<commit-ish>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
git-resolve-script(1)
|
||||
=====================
|
||||
git-resolve(1)
|
||||
==============
|
||||
v0.99.5, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-resolve-script - Merge two commits
|
||||
git-resolve - Merge two commits
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-revert-script(1)
|
||||
====================
|
||||
git-revert(1)
|
||||
=============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-revert-script - Revert an existing commit.
|
||||
git-revert - Revert an existing commit.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-revert-script' [-n] <commit>
|
||||
'git-revert' [-n] <commit>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-send-email-script(1)
|
||||
========================
|
||||
git-send-email(1)
|
||||
=================
|
||||
v0.1, July 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-send-email-script - Send a collection of patches as emails
|
||||
git-send-email - Send a collection of patches as emails
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-send-email-script' [options] <file|directory> [... file|directory]
|
||||
'git-send-email' [options] <file|directory> [... file|directory]
|
||||
|
||||
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ Author
|
|||
------
|
||||
Written by Ryan Anderson <ryan@michonline.com>
|
||||
|
||||
git-send-email-script is originally based upon
|
||||
git-send-email is originally based upon
|
||||
send_lots_of_email.pl by Greg Kroah-Hartman.
|
||||
|
||||
Documentation
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
git-sh-setup-script(1)
|
||||
======================
|
||||
git-sh-setup(1)
|
||||
===============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-sh-setup-script - Common git shell script setup code.
|
||||
git-sh-setup - Common git shell script setup code.
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-sh-setup-script'
|
||||
'git-sh-setup'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -16,7 +16,7 @@ Sets up the normal git environment variables and a few helper functions
|
|||
(currently just "die()"), and returns ok if it all looks like a git archive.
|
||||
So use it something like
|
||||
|
||||
. git-sh-setup-script || die "Not a git archive"
|
||||
. git-sh-setup || die "Not a git archive"
|
||||
|
||||
to make the rest of the git scripts more careful and readable.
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ the name of the branch because it is obvious.
|
|||
$ git show-branch --more=4 master
|
||||
[master] Add 'git show-branch'.
|
||||
[~1] Add a new extended SHA1 syntax <name>~<num>
|
||||
[~2] Fix "git-diff-script A B"
|
||||
[~2] Fix "git-diff A B"
|
||||
[~3] git-ls-files: generalized pathspecs
|
||||
[~4] Make "git-ls-files" work in subdirectories
|
||||
------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
git-ssh-pull(1)
|
||||
===============
|
||||
git-ssh-fetch(1)
|
||||
================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-ssh-pull - Pulls from a remote repository over ssh connection
|
||||
git-ssh-fetch - Pulls from a remote repository over ssh connection
|
||||
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-ssh-pull' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url
|
||||
'git-ssh-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Pulls from a remote repository over ssh connection, invoking
|
||||
git-ssh-push on the other end. It functions identically to
|
||||
git-ssh-push, aside from which end you run it on.
|
||||
git-ssh-upload on the other end. It functions identically to
|
||||
git-ssh-upload, aside from which end you run it on.
|
||||
|
||||
|
||||
OPTIONS
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
git-ssh-push(1)
|
||||
===============
|
||||
git-ssh-upload(1)
|
||||
=================
|
||||
v0.1, Jun 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-ssh-push - Pushes to a remote repository over ssh connection
|
||||
git-ssh-upload - Pushes to a remote repository over ssh connection
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-ssh-push' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url
|
||||
'git-ssh-upload' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Pushes from a remote repository over ssh connection, invoking
|
||||
git-ssh-pull on the other end. It functions identically to
|
||||
git-ssh-pull, aside from which end you run it on.
|
||||
git-ssh-fetch on the other end. It functions identically to
|
||||
git-ssh-fetch, aside from which end you run it on.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
git-status-script(1)
|
||||
====================
|
||||
git-status(1)
|
||||
=============
|
||||
v0.99.4, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-status-script - Show working tree status.
|
||||
git-status - Show working tree status.
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
@ -16,7 +16,7 @@ DESCRIPTION
|
|||
Examines paths in the working tree that has changes unrecorded
|
||||
to the index file, and changes between the index file and the
|
||||
current HEAD commit. The former paths are what you _could_
|
||||
commit by running 'git-update-cache' before running 'git
|
||||
commit by running 'git-update-index' before running 'git
|
||||
commit', and the latter paths are what you _would_ commit by
|
||||
running 'git commit'.
|
||||
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
git-tag-script(1)
|
||||
=================
|
||||
git-tag(1)
|
||||
==========
|
||||
v0.99.4, Aug 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-tag-script - Create a tag object signed with GPG
|
||||
git-tag - Create a tag object signed with GPG
|
||||
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-tag-script' [-s | -a] [-f] <name>
|
||||
'git-tag' [-s | -a] [-f] <name>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
git-update-cache(1)
|
||||
git-update-index(1)
|
||||
===================
|
||||
v0.1, May 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-update-cache - Modifies the index or directory cache
|
||||
git-update-index - Modifies the index or directory cache
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-update-cache'
|
||||
'git-update-index'
|
||||
[--add] [--remove] [--refresh] [--replace]
|
||||
[--ignore-missing]
|
||||
[--force-remove]
|
||||
|
|
@ -23,7 +23,7 @@ Modifies the index or directory cache. Each file mentioned is updated
|
|||
into the cache and any 'unmerged' or 'needs updating' state is
|
||||
cleared.
|
||||
|
||||
The way "git-update-cache" handles files it is told about can be modified
|
||||
The way "git-update-index" handles files it is told about can be modified
|
||||
using the various options:
|
||||
|
||||
OPTIONS
|
||||
|
|
@ -59,7 +59,7 @@ OPTIONS
|
|||
|
||||
--replace::
|
||||
By default, when a file `path` exists in the index,
|
||||
git-update-cache refuses an attempt to add `path/file`.
|
||||
git-update-index refuses an attempt to add `path/file`.
|
||||
Similarly if a file `path/file` exists, a file `path`
|
||||
cannot be added. With --replace flag, existing entries
|
||||
that conflicts with the entry being added are
|
||||
|
|
@ -94,7 +94,7 @@ merging.
|
|||
|
||||
To pretend you have a file with mode and sha1 at path, say:
|
||||
|
||||
$ git-update-cache --cacheinfo mode sha1 path
|
||||
$ git-update-index --cacheinfo mode sha1 path
|
||||
|
||||
'--info-only' is used to register files without placing them in the object
|
||||
database. This is useful for status-only repositories.
|
||||
|
|
@ -109,7 +109,7 @@ Examples
|
|||
--------
|
||||
To update and refresh only the files already checked out:
|
||||
|
||||
git-checkout-cache -n -f -a && git-update-cache --ignore-missing --refresh
|
||||
git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
|
||||
|
||||
|
||||
Author
|
||||
|
|
@ -44,7 +44,7 @@ Your sysadmin must hate you!::
|
|||
See Also
|
||||