Skip to content

Commit

Permalink
GIT 0.99.9b
Browse files Browse the repository at this point in the history 
This contains the changes made on the master branch since 0.99.9a.

The workaround for building RPMs has not changed since 0.99.9a,
mainly because I haven't heard back if it was good enough for
kernel.org consumption, or otherwise what changes are needed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Nov 2, 2005
2 parents d92ddb5 + 8e6ae4a commit 235d521
Show file tree
Hide file tree
Showing 15 changed files with 98 additions and 156 deletions.
2 changes: 0 additions & 2 deletions Documentation/git-am.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ Documentation
--------------
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.

This manual page is a stub. You can help the git documentation by expanding it.

GIT
---
Part of the gitlink:git[7] suite
Expand Down
6 changes: 5 additions & 1 deletion Documentation/git-cvsimport.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SYNOPSIS
--------
'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
[ -C <git_repository> ] [ -i ] [ -k ]
[ -C <git_repository> ] [ -i ] [ -P <file> ] [ -k ]
[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]


Expand Down Expand Up @@ -60,6 +60,10 @@ the old cvs2git tool.
+
If you need to pass multiple options, separate them with a comma.

-P:: <cvsps-output-file>
Instead of calling cvsps, read the provided cvsps output file. Useful
for debugging or when cvsps is being handled outside cvsimport.

-m::
Attempt to detect merges based on the commit message. This option
will enable default regexes that try to capture the name source
Expand Down
39 changes: 39 additions & 0 deletions Documentation/git-fmt-merge-msg.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
git-fmt-merge-msg(1)
====================

NAME
----
git-fmt-merge-msg - Produce a merge commit message


SYNOPSIS
--------
'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD

DESCRIPTION
-----------
Takes the list of merged objects on stdin and produces a suitable
commit message to be used for the merge commit, usually to be
passed as the '<merge-message>' argument of `git-merge`.

This script is intended mostly for internal use by scripts
automatically invoking `git-merge`.


SEE ALSO
--------
gitlink:git-merge[1]


Author
------
Written by Junio C Hamano <junkio@cox.net>

Documentation
--------------
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.

GIT
---
Part of the gitlink:git[7] suite

10 changes: 10 additions & 0 deletions Documentation/git-merge.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ OPTIONS
there is no `-s` option, built-in list of strategies is
used instead.

<msg>::
The commit message to be used for the merge commit (in case
it is created). The `git-fmt-merge-msg` script can be used
to give a good default for automated `git-merge` invocations.

<head>::
our branch head commit.

Expand All @@ -37,6 +42,11 @@ OPTIONS
obviously means you are trying an Octopus.


SEE ALSO
--------
gitlink:git-fmt-merge-msg[1]


Author
------
Written by Junio C Hamano <junkio@cox.net>
Expand Down
3 changes: 3 additions & 0 deletions Documentation/git-pull.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ When only one ref is downloaded, runs 'git resolve' to merge it
into the local HEAD. Otherwise uses 'git octopus' to merge them
into the local HEAD.

Note that you can use '.' (current directory) as the
<repository> to pull from the local repository -- this is useful
when merging local branches into the current branch.

OPTIONS
-------
Expand Down
44 changes: 0 additions & 44 deletions Documentation/git.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ gitlink:git-apply[1]::

gitlink:git-checkout-index[1]::
Copy files from the cache to the working directory
Previously this command was known as git-checkout-cache.

gitlink:git-commit-tree[1]::
Creates a new commit object
Expand All @@ -76,7 +75,6 @@ gitlink:git-init-db[1]::

gitlink:git-merge-index[1]::
Runs a merge for files needing merging
Previously this command was known as git-merge-cache.

gitlink:git-mktag[1]::
Creates a tag object
Expand All @@ -95,7 +93,6 @@ gitlink:git-unpack-objects[1]::

gitlink:git-update-index[1]::
Modifies the index or directory cache
Previously this command was known as git-update-cache.

gitlink:git-write-tree[1]::
Creates a tree from the current cache
Expand All @@ -109,7 +106,6 @@ gitlink:git-cat-file[1]::

gitlink:git-diff-index[1]::
Compares content and mode of blobs between the cache and repository
Previously this command was known as git-diff-cache.

gitlink:git-diff-files[1]::
Compares files in the working tree and the cache
Expand All @@ -122,7 +118,6 @@ gitlink:git-diff-tree[1]::

gitlink:git-fsck-objects[1]::
Verifies the connectivity and validity of the objects in the database
Previously this command was known as git-fsck-cache.

gitlink:git-ls-files[1]::
Information about files in the cache/working directory
Expand Down Expand Up @@ -170,11 +165,9 @@ gitlink:git-fetch-pack[1]::

gitlink:git-http-fetch[1]::
Downloads a remote git repository via HTTP
Previously this command was known as git-http-pull.

gitlink:git-local-fetch[1]::
Duplicates another git repository on a local system
Previously this command was known as git-local-pull.

gitlink:git-peek-remote[1]::
Lists references on a remote repository using upload-pack protocol.
Expand All @@ -190,11 +183,9 @@ gitlink:git-shell[1]::

gitlink:git-ssh-fetch[1]::
Pulls from a remote repository over ssh connection
Previously this command was known as git-ssh-pull.

gitlink:git-ssh-upload[1]::
Helper "server-side" program used by git-ssh-fetch
Previously this command was known as git-ssh-push.

gitlink:git-update-server-info[1]::
Updates auxiliary information on a dumb server to help
Expand All @@ -210,7 +201,6 @@ Porcelain-ish Commands

gitlink:git-add[1]::
Add paths to the index file.
Previously this command was known as git-add-script.

gitlink:git-am[1]::
Apply patches from a mailbox, but cooler.
Expand All @@ -220,50 +210,39 @@ gitlink:git-applymbox[1]::

gitlink:git-bisect[1]::
Find the change that introduced a bug.
Previously this command was known as git-bisect-script.

gitlink:git-branch[1]::
Create and Show branches.
Previously this command was known as git-branch-script.

gitlink:git-checkout[1]::
Checkout and switch to a branch.
Previously this command was known as git-checkout-script.

gitlink:git-cherry-pick[1]::
Cherry-pick the effect of an existing commit.
Previously this command was known as git-cherry-pick-script.

gitlink:git-clone[1]::
Clones a repository into a new directory.
Previously this command was known as git-clone-script.

gitlink:git-commit[1]::
Record changes to the repository.
Previously this command was known as git-commit-script.

gitlink:git-diff[1]::
Show changes between commits, commit and working tree, etc.
Previously this command was known as git-diff-script.

gitlink:git-fetch[1]::
Download from a remote repository via various protocols.
Previously this command was known as git-fetch-script.

gitlink:git-format-patch[1]::
Prepare patches for e-mail submission.
Previously this command was known as git-format-patch-script.

gitlink:git-grep[1]::
Print lines matching a pattern

gitlink:git-log[1]::
Shows commit logs.
Previously this command was known as git-log-script.

gitlink:git-ls-remote[1]::
Shows references in a remote or local repository.
Previously this command was known as git-ls-remote-script.

gitlink:git-merge[1]::
Grand unified merge driver.
Expand All @@ -273,39 +252,30 @@ gitlink:git-mv[1]::

gitlink:git-octopus[1]::
Merge more than two commits.
Previously this command was known as git-octopus-script.

gitlink:git-pull[1]::
Fetch from and merge with a remote repository.
Previously this command was known as git-pull-script.

gitlink:git-push[1]::
Update remote refs along with associated objects.
Previously this command was known as git-push-script.

gitlink:git-rebase[1]::
Rebase local commits to new upstream head.
Previously this command was known as git-rebase-script.

gitlink:git-rename[1]::
Rename files and directories.
Previously this command was known as git-rename-script.

gitlink:git-repack[1]::
Pack unpacked objects in a repository.
Previously this command was known as git-repack-script.

gitlink:git-reset[1]::
Reset current HEAD to the specified state.
Previously this command was known as git-reset-script.

gitlink:git-resolve[1]::
Merge two commits.
Previously this command was known as git-resolve-script.

gitlink:git-revert[1]::
Revert an existing commit.
Previously this command was known as git-revert-script.

gitlink:git-shortlog[1]::
Summarizes 'git log' output.
Expand All @@ -315,11 +285,9 @@ gitlink:git-show-branch[1]::

gitlink:git-status[1]::
Shows the working tree status.
Previously this command was known as git-status-script.

gitlink:git-verify-tag[1]::
Check the GPG signature of tag.
Previously this command was known as git-verify-tag-script.

gitlink:git-whatchanged[1]::
Shows commit logs and differences they introduce.
Expand All @@ -334,41 +302,33 @@ gitlink:git-applypatch[1]::

gitlink:git-archimport[1]::
Import an arch repository into git.
Previously this command was known as git-archimport-script.

gitlink:git-convert-objects[1]::
Converts old-style git repository
Previously this command was known as git-convert-cache.

gitlink:git-cvsimport[1]::
Salvage your data out of another SCM people love to hate.
Previously this command was known as git-cvsimport-script.

gitlink:git-merge-one-file[1]::
The standard helper program to use with "git-merge-index"
Previously this command was known as git-merge-one-file-script.

gitlink:git-prune[1]::
Prunes all unreachable objects from the object database
Previously this command was known as git-prune-script.

gitlink:git-relink[1]::
Hardlink common objects in local repositories.
Previously this command was known as git-relink-script.

gitlink:git-svnimport[1]::
Import a SVN repository into git.

gitlink:git-sh-setup[1]::
Common git shell script setup code.
Previously this command was known as git-sh-setup-script.

gitlink:git-symbolic-ref[1]::
Read and modify symbolic refs

gitlink:git-tag[1]::
An example script to create a tag object signed with GPG
Previously this command was known as git-tag-script.

gitlink:git-update-ref[1]::
Update the object name stored in a ref safely.
Expand All @@ -384,7 +344,6 @@ gitlink:git-cherry[1]::

gitlink:git-count-objects[1]::
Count unpacked number of objects and their disk consumption.
Previously this command was known as git-count-objects-script.

gitlink:git-daemon[1]::
A really simple server for git repositories.
Expand All @@ -403,18 +362,15 @@ gitlink:git-patch-id[1]::

gitlink:git-parse-remote[1]::
Routines to help parsing $GIT_DIR/remotes/
Previously this command was known as git-parse-remote-script.

gitlink:git-request-pull[1]::
git-request-pull.
Previously this command was known as git-request-pull-script.

gitlink:git-rev-parse[1]::
Pick out and massage parameters.

gitlink:git-send-email[1]::
Send patch e-mails out of "format-patch --mbox" output.
Previously this command was known as git-send-email-script.

gitlink:git-symbolic-refs[1]::
Read and modify symbolic refs.
Expand Down
4 changes: 3 additions & 1 deletion Documentation/tutorial.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,9 @@ multiple working trees, but disk space is cheap these days.

[NOTE]
You could even pull from your own repository by
giving '.' as <remote-repository> parameter to `git pull`.
giving '.' as <remote-repository> parameter to `git pull`. This
is useful when you want to merge a local branch (or more, if you
are making an Octopus) into the current branch.

It is likely that you will be pulling from the same remote
repository from time to time. As a short hand, you can store
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# DEFINES += -DUSE_STDEV

GIT_VERSION = 0.99.9a
GIT_VERSION = 0.99.9b

CFLAGS = -g -O2 -Wall
ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
Expand Down Expand Up @@ -94,7 +94,7 @@ SCRIPT_SH = \
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \
git-findtags.perl git-svnimport.perl git-mv.perl
git-svnimport.perl git-mv.perl

SCRIPT_PYTHON = \
git-merge-recursive.py
Expand Down Expand Up @@ -413,7 +413,6 @@ check:
install: $(PROGRAMS) $(SCRIPTS)
$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))
sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir))
$(MAKE) -C templates install
$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
$(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
Expand Down
Loading

0 comments on commit 235d521

Please sign in to comment.