undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with master.

Browse Source
This commit is contained in:
Junio C Hamano 2005-08-18 15:46:07 -07:00
commit d430042bcf
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Documentation/glossary.txt
View File

@ -26,9 +26,9 @@ blob object::
Untyped object, e.g. the contents of a file. Untyped object, e.g. the contents of a file.
tree object:: tree object::
An object containing a list of blob and/or tree objects. An object containing a list of file names and modes along with refs
(A tree usually corresponds to a directory without to the associated blob and/or tree objects. A tree object is
subdirectories). equivalent to a directory.
tree:: tree::
Either a working tree, or a tree object together with the Either a working tree, or a tree object together with the
@ -118,11 +118,14 @@ tree-ish::
tag object pointing to a tag or commit or tree object. tag object pointing to a tag or commit or tree object.
ent:: ent::
Favorite synonym to "tree-ish" by some total geeks. Favorite synonym to "tree-ish" by some total geeks. See
http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
explanation.
tag object:: tag object::
An object containing a ref pointing to another object. It can An object containing a ref pointing to another object, which can
contain a (PGP) signature, in which case it is called "signed contain a message just like a commit object. It can also
contain a (PGP) signature, in which case it is called a "signed
tag object". tag object".
tag:: tag::
@ -143,6 +146,15 @@ resolve::
The action of fixing up manually what a failed automatic merge The action of fixing up manually what a failed automatic merge
left behind. left behind.
rewind::
To throw away part of the development, i.e. to assign the head to
an earlier revision.
rebase::
To clean a branch by starting from the head of the main line of
development ("master"), and reapply the (possibly cherry-picked)
changes from that branch.
repository:: repository::
A collection of refs together with an object database containing A collection of refs together with an object database containing
all objects, which are reachable from the refs, possibly accompanied all objects, which are reachable from the refs, possibly accompanied
@ -196,6 +208,10 @@ pack index::
The list of identifiers, and other information, of the objects in a The list of identifiers, and other information, of the objects in a
pack, to assist in efficiently accessing the contents of a pack. pack, to assist in efficiently accessing the contents of a pack.
core git::
Fundamental data structures and utilities of git. Exposes only
limited source code management tools.
plumbing:: plumbing::
Cute name for core git. Cute name for core git.

2
git-rebase-script
View File

@ -26,7 +26,7 @@ case "$#" in
esac esac
upstream=`git-rev-parse --verify "$1"` && upstream=`git-rev-parse --verify "$1"` &&
ours=`git-rev-parse --verify "$ours_symbolic^` || exit ours=`git-rev-parse --verify "$ours_symbolic"` || exit
test "$(git-diff-cache --cached "$ours")" = "" || test "$(git-diff-cache --cached "$ours")" = "" ||
die "Your working tree does not match $ours_symbolic." die "Your working tree does not match $ours_symbolic."