Commit Graph

26842 Commits

Author SHA1 Message Date
Kay Sievers
1207151d40 v073 2005-08-07 20:18:01 +02:00
Kay Sievers
820e4f6b6b v071 2005-08-07 20:17:50 +02:00
Kay Sievers
9cd3d98873 v070 2005-08-07 20:17:42 +02:00
Kay Sievers
664f4cc5eb v064 2005-08-07 20:17:19 +02:00
Kay Sievers
b51103f3cd v063 2005-08-07 20:17:09 +02:00
Kay Sievers
2ae100df54 v062 2005-08-07 20:17:00 +02:00
Kay Sievers
d51e902a09 v057 2005-08-07 20:16:07 +02:00
Kay Sievers
061cc7cdcf v056 2005-08-07 20:15:57 +02:00
Kay Sievers
a59d4afd69 v055 2005-08-07 20:15:44 +02:00
Kay Sievers
2ad9331e15 v053
rename gitweb.pl to gitweb.cgi
2005-08-07 20:14:48 +02:00
Kay Sievers
185f09e5ba v049 2005-08-07 20:13:11 +02:00
Kay Sievers
ff7669a5b9 v048 2005-08-07 20:13:02 +02:00
Kay Sievers
fbb592a91e v043 2005-08-07 20:12:11 +02:00
Kay Sievers
991910a9ff v042 2005-08-07 20:09:33 +02:00
Kay Sievers
86eed32d36 v041 2005-08-07 20:08:29 +02:00
Kay Sievers
54b0a43c3f v041 2005-08-07 20:08:03 +02:00
Kay Sievers
022be3d0f1 v035 2005-08-07 20:06:09 +02:00
Kay Sievers
d767d59c8a v031 2005-08-07 20:05:55 +02:00
Kay Sievers
8ed23e1bfb v027 2005-08-07 20:05:44 +02:00
Kay Sievers
959c6a1efc v026 2005-08-07 20:05:32 +02:00
Kay Sievers
3e029299d8 v025 2005-08-07 20:05:15 +02:00
Kay Sievers
3f714537ae v021 2005-08-07 20:03:52 +02:00
Kay Sievers
703ac7102f v021 2005-08-07 20:03:14 +02:00
Kay Sievers
12a88f2f03 v021 2005-08-07 20:02:47 +02:00
Kay Sievers
e334d18cfd v021 2005-08-07 20:02:33 +02:00
Kay Sievers
a7e09a96a8 v020 2005-08-07 20:00:05 +02:00
Kay Sievers
1b1433800e v016 2005-08-07 19:59:41 +02:00
Kay Sievers
44ad2978e6 v014 2005-08-07 19:59:24 +02:00
Kay Sievers
52ccdd4092 v006 2005-08-07 19:58:12 +02:00
Kay Sievers
823d5dc81f v005 2005-08-07 19:57:58 +02:00
Kay Sievers
22fafb99e3 v004 2005-08-07 19:56:59 +02:00
Kay Sievers
adf3ee8e48 v003 2005-08-07 19:56:44 +02:00
Kay Sievers
c068cff1f9 v003 2005-08-07 19:56:10 +02:00
Kay Sievers
b531daf3a1 v002 2005-08-07 19:55:05 +02:00
Kay Sievers
e0389bd7f2 v001 2005-08-07 19:54:31 +02:00
Kay Sievers
ecb378f5b5 v000 2005-08-07 19:53:54 +02:00
Kay Sievers
4c02e3c56f v000 2005-08-07 19:52:52 +02:00
Kay Sievers
161332a521 first working version 2005-08-07 19:49:46 +02:00
Paul Mackerras
d6e8149bc5 Use lf translation rather than binary when reading commit data.
The effect of this is that it allows Tcl to do the locale-specific
conversion of the input data to its internal unicode representation.
That means that commit messages in Russian or other languages should
be displayed correctly now (according to the locale that is in effect.)
2005-08-07 20:01:24 +10:00
Junio C Hamano
f29eaed12f Fix build rules for debian package.
Run install-tools target to install the tools to accept e-mail
patches.  Also clean up the main Makefile a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 22:29:21 -07:00
Paul Mackerras
94a2eede68 Change cursor to a hand cursor when over a SHA1 ID link.
This is based on suggestions by Jeff Epler and Linus Torvalds, but
extended so that we do the switching between the watch cursor and
the normal cursor correctly as well.

Also fixed a bug pointed out by Junio Hamano - I wasn't incrementing
the link number (duh!).
2005-08-07 15:27:57 +10:00
Junio C Hamano
d5928d6026 Fix RPM build that omitted templates and tools.
Many many thanks go to Chris Wright and H. Peter Anvin whose
help were essential to get me going this build.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 20:54:49 -07:00
Junio C Hamano
55bc3fe36a Merge with master.
This merges commit
    bfe19f876c
from master into our head commit
    7a59013290

Sincerely,
    jit-merge command.
2005-08-06 20:54:43 -07:00
Linus Torvalds
bfe19f876c [PATCH] Extend "git reset" to take a reset point
This was triggered by a query by Sam Ravnborg, and extends "git reset" to
reset the index and the .git/HEAD pointer to an arbitrarily named point.

For example

	git reset HEAD^

will just reset the current HEAD to its own parent - leaving the working
directory untouched, but effectively un-doing the top-most commit. You
might want to do this if you realize after you committed that you made a
mistake that you want to fix up: reset your HEAD back to its previous
state, fix up the working directory and re-do the commit.

If you want to totally un-do the commit (and reset your working directory
to that point too), you'd first use "git reset HEAD^" to reset to the
parent, and then do a "git checkout -f" to reset the working directory
state to that point in time too.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 20:44:20 -07:00
Junio C Hamano
7a59013290 GIT 0.99.4 (release candidate)
This is my first attempt to adjust Debian and RPM to pass
prefix, to prepare the 0.99.4 release.

It updates debian/rules and git-core.spec.in to properly pass
prefix when building binary packages.  It also updates
debian/changelog to make the resulting binary package name
0.99.4; this is not needed on the RPM side (it takes the version
number from the main Makefile).

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 17:23:52 -07:00
Junio C Hamano
d3af621b14 Redo the templates generation and installation.
Per discussion with people interested in binary packaging,
change the default template location from /etc/git-core to
/usr/share/git-core hierarchy.  If a user wants to run git
before installing for whatever reason, in addition to adding
$src to the PATH environment variable, git-init-db can be run
with --template=$src/templates/blt/ parameter.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 13:49:26 -07:00
Junio C Hamano
f5b7495609 gitk proposed fix: handle more than one SHA1 links.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 10:19:39 -07:00
Junio C Hamano
15e02b372d send-pack: allow generic sha1 expression on the source side.
This extends the source side semantics to match what Linus
suggested.

An example:

    $ git-send-pack kernel.org:/pub/scm/git/git.git pu^^:master pu

    would allow me to push the current pu into pu, and the
    commit two commits before it into master, on my public
    repository.

The revised rule for updating remote heads is as follows.

 $ git-send-pack [--all] <remote> [<ref>...]

 - When no <ref> is specified:

   - with '--all', it is the same as specifying the full refs/*
     path for all local refs;

   - without '--all', it is the same as specifying the full
     refs/* path for refs that exist on both ends;

 - When one or more <ref>s are specified:

   - a single token <ref> (i.e. no colon) must be a pattern that
     tail-matches refs/* path for an existing local ref.  It is
     an error for the pattern to match no local ref, or more
     than one local refs.  The matching ref is pushed to the
     remote end under the same name.

   - <src>:<dst> can have different cases.  <src> is first tried
     as the tail-matching pattern for refs/* path.

     - If more than one matches are found, it is an error.

     - If one match is found, <dst> must either match no remote
       ref and start with "refs/", or match exactly one remote
       ref.  That remote ref is updated with the sha1 value
       obtained from the <src> sha1.

     - If no match is found, it is given to get_extended_sha1();
       it is an error if get_extended_sha1() does not find an
       object name.  If it succeeds, <dst> must either match
       no remote ref and start with "refs/" or match exactly
       one remote ref.  That remote ref is updated with the sha1
       value.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 10:19:38 -07:00
Junio C Hamano
db27ee6392 send-pack: allow the same source to be pushed more than once.
The revised code accidentally inherited the restriction that a
reference can be pushed only once, only because the original did
not allow renaming.  This is no longer necessary so lift it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 10:19:38 -07:00
Linus Torvalds
e4ad5f0979 [PATCH] Make git-sh-setup-script do what it was supposed to do
Duh. A missing && meant that half the tests that git-sh-setup-script were
_meant_ to do were actually totally ignored.

In particular, the git sanity checking ended up only testing that the
GIT_OBJECT_DIRECTORY was sane, not that GIT_DIR itself was..

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 10:19:17 -07:00