summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* GIT 0.99.6v0.99.6Junio C Hamano2005-09-071-1/+1
|\
| * Merge branch 'master' of . Junio C Hamano2005-09-051-1/+2
| |\
| * \ Merge refs/heads/master from . Junio C Hamano2005-08-291-1/+2
| |\ \
| * \ \ Merge master branch changes into release candidate branch.Junio C Hamano2005-08-261-1/+4
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | Prepare 0.99.6 branch.Junio C Hamano2005-08-241-1/+1
| | | | |
* | | | | Flatten tools/ directory to make build procedure simpler.Junio C Hamano2005-09-071-13/+36
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make platform specific part more isolated. Currently we only have Darwin defined, but I've taken a look at SunOS specific patch (which I dropped on the floor for now) as well. Doing things this way would make adding it easier. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Retire git-clone-dumb-http.Junio C Hamano2005-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... and fold it into git-clone-script. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Install archimport-script.Junio C Hamano2005-09-041-0/+1
| |_|/ |/| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Remove git-apply-patch-script.Junio C Hamano2005-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now the rebase is rewritten to use git cherry-pick, there is no user for that ancient script. I've checked Cogito and StGIT to make sure they do not use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Redo "revert" using three-way merge machinery.Junio C Hamano2005-08-291-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reverse patch application using "git apply" sometimes is too rigid. Since the user would get used to resolving conflicting merges by hand during the normal merge experience, using the same machinery would be more helpful rather than just giving up. Cherry-picking and reverting are essentially the same operation. You pick one commit, and apply the difference that commit introduces to its own commit ancestry chain to the current tree. Revert applies the diff in reverse while cherry-pick applies it forward. They share the same logic, just different messages and merge direction. Rewrite "git rebase" using "git cherry-pick". Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Enable git-send-email-script on Debian.Junio C Hamano2005-08-261-1/+4
|/ | | | | | | | | | You can define WITH_SEND_EMAIL to include the send-email command as part of the installation. Since Debian, unlike RPM/Fedora, has the two necessary Perl modules available as part of the mainline distribution, there is no reason for us to shy away from shipping send-email. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge refs/heads/master from . Junio C Hamano2005-08-241-1/+2
|\
| * [PATCH] Infamous 'octopus merge'Junio C Hamano2005-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This script uses the list of heads and their origin multi-head "git fetch" left in the $GIT_DIR/FETCH_HEAD file, and makes an octopus merge on top of the current HEAD using them. The implementation tries to be strict for the sake of safety. It insists that your working tree is clean (no local changes) and matches the HEAD, and when any of the merged heads does not automerge, the whole process is aborted and tries to rewind your working tree is to the original state. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Retire git-parse-remote.Junio C Hamano2005-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | Update git-pull to match updated git-fetch and allow pull to fetch from multiple remote references. There is no support for resolving more than two heads, which will be done with "git octopus". Update "git ls-remote" to use git-parse-remote-script. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Start adding the $GIT_DIR/remotes/ support.Junio C Hamano2005-08-241-1/+1
| | | | | | | | | | | | | | All the necessary parsing code is in git-parse-remote-script; update git-push-script to use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge refs/heads/master from . Junio C Hamano2005-08-231-2/+1
|\ \ | |/
| * Clean-up output from "git show-branch" and document it.Junio C Hamano2005-08-221-1/+0
| | | | | | | | | | | | | | | | When showing only one branch a lot of default output becomes redundant, so clean it up a bit, and document what is shown. Retire the earlier implementation "git-show-branches-script". Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Add 'git show-branch'.Junio C Hamano2005-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'git show-branches' command turns out to be reasonably useful, but painfully slow. So rewrite it in C, using ideas from merge-base while enhancing it a bit more. - Unlike show-branches, it can take --heads (show me all my heads), --tags (show me all my tags), or --all (both). - It can take --more=<number> to show beyond the merge-base. - It shows the short name for each commit in the extended SHA1 syntax. - It can find merge-base for more than two heads. Examples: $ git show-branch --more=6 HEAD is almost the same as "git log --pretty=oneline --max-count=6". $ git show-branch --merge-base master mhf misc finds the merge base of the three given heads. $ git show-branch master mhf misc shows logs from the top of these three branch heads, up to their common ancestor commit is shown. $ git show-branch --all --more=10 is poor-man's gitk, showing all the tags and heads, and going back 10 commits beyond the merge base of those refs. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge with master to get diff fixes.Junio C Hamano2005-08-161-1/+1
|\ \ | |/
| * [PATCH] Make "git diff" work inside relative subdirectoriesLinus Torvalds2005-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always show the diff as an absolute path, but pathnames to diff are taken relative to the current working directory (and if no pathnames are given, the default ends up being all of the current working directory). Note that "../xyz" also works, so you can do cd linux/drivers/char git diff ../block and it will generate a diff of the linux/drivers/block changes. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge master changes into rc.Junio C Hamano2005-08-151-0/+1
|\ \ | |/
| * Add git-show-branches-scriptJunio C Hamano2005-08-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Often I find myself wanting to do quick branches check when I am not in the windowing environment and cannot run gitk. This stupid script shows commits leading to the heads of interesting branches with indication which ones belong to which branches, so that fork point is somewhat discernible without using gitk. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge master changes into release candidate branch.Junio C Hamano2005-08-131-42/+47
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make tools/ directory first-class citizen.Junio C Hamano2005-08-121-2/+0
| | | | | | | | | | | | | | | | Tools directory being separate is just a historical coincidence. Build and install together with the main directory, just like the clean target does. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Unify Makefile indentationPetr Baudis2005-08-121-14/+14
| | | | | | | | | | | | | | | | | | | | | | Use <tab> instead of two spaces uniformly in the Makefile, even in the ifdefs. Gives it a nice consistent look. [jc: At the same time I indented the nested ifdefs to make them slightly easier to read.] Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Use $DESTDIR instead of $destPetr Baudis2005-08-121-3/+3
| | | | | | | | | | | | | | | | $DESTDIR is more usual during the build than $dest and is what is usually used in the makefiles, so let's use it too. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make CFLAGS overridable from make command line.Pavel Roskin2005-08-121-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch renames COPTS to CFLAGS, because it's COPTS that was user overridable. Also, -Wall is moved there because it's optional. What was CFLAGS is now ALL_CFLAGS, which users should not override. Defines are added to DEFINES. Since ALL_CFLAGS is recursively expanded, it uses the final value of DEFINES. Implicit rules are made explicit since the implicit rules use CFLAGS rather than ALL_CFLAGS. I believe that serious projects should not rely on implicit rules anyway. Percent rules are used because they are used already and because they don't need the .SUFFIXES target. [jc: in addition to updating the patch for 0.99.4, I fixed up a glitch in Pavel's original patch which compiled sha1.o out of mozilla-sha1/sha1.c, where it should have left the resulting object file in mozilla-sha1 directory for later "ar".] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Clean generated files a bit more, to cope with Debian build droppings.Junio C Hamano2005-08-121-2/+5
| | | | | | | | Also attempt to build a source package for debian.
* | Merge changes in the master branch into 0.99.5 preparation branch.Junio C Hamano2005-08-111-1/+2
|\ \ | |/
| * Clean generated deb files.Junio C Hamano2005-08-111-1/+2
| | | | | | | | | | | | Do not forgot that we have a separate git-tk package these days. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Start preparing for 0.99.5Junio C Hamano2005-08-101-1/+1
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge with master.Junio C Hamano2005-08-101-0/+1
|\ | | | | | | | | | | | | | | | | | | This merges commit c35a7b8d806317dc1762e36561cbd31c2530dd9c from master into our head commit edee414c3e5a546aae3dd1529f397df949713305 Sincerely, jit-merge command.
| * git-revert: revert an existing commit.Junio C Hamano2005-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Given one existing commit, revert the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no modifications from the HEAD commit). This is based on what Linus posted to the list, with enhancements he suggested, including the use of -M to attempt reverting renames. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge with master.Junio C Hamano2005-08-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | This merges commit f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda from master into our head commit c3958a7926ab20b90fe0767580b466698477f5b6 Sincerely, jit-merge command.
| * Downgrade git-send-email-scriptJunio C Hamano2005-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | RPM folks have problem installing the package otherwise. Since its usefulness does have much to do with GIT, downgrade it to "contrib" status for now. We may want to move it to contrib/ subdirectory after auditing other programs when we reorganize the source tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge with master.Junio C Hamano2005-08-081-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | This merges commit 3c4e8a636f4de3668b24d0020df731cdc78ae6e9 from master into our head commit 80f45687f44b6258b0eacae6b1ae15e3ad4a6552 Sincerely, jit-merge command.
| * Makefile dependency fix.Junio C Hamano2005-08-081-0/+1
| | | | | | | | | | | | | | Johannes Schindelin noticed that recent Makefile updates were too eager to loosen dependencies. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix build rules for debian package.Junio C Hamano2005-08-061-5/+5
| | | | | | | | | | | | | | 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>
* | GIT 0.99.4 (release candidate)Junio C Hamano2005-08-061-8/+10
|/ | | | | | | | | | | | | 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>
* Redo the templates generation and installation.Junio C Hamano2005-08-061-3/+6
| | | | | | | | | | | 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>
* Update get_sha1() to grok extended format.Junio C Hamano2005-08-051-1/+2
| | | | | | | | | | | | | Everybody envies rev-parse, who is the only one that can grok the extended sha1 format. Move the get_extended_sha1() out of rev-parse, rename it to get_sha1() and make it available to everybody else. The one I posted earlier to the list had one bug where it did not handle a name that ends with a digit correctly (it incorrectly tried the "Nth parent" path). This commit fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Retire check-files.Junio C Hamano2005-08-031-1/+1
| | | | | | | | | | | | The king penguin said: It has no point any more, all the tools check the file status on their own, and yes, the thing should probably be removed. and the faithful servant makes it so. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Install sample hooksJunio C Hamano2005-08-031-0/+5
| | | | | | | | | A template mechanism to populate newly initialized repository with default set of files is introduced. Use it to ship example hooks that can be used for update and post update checks, as Josef Weidendorfer suggests. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Add git-send-email-script - tool to send emails from ↵Ryan Anderson2005-08-021-0/+1
| | | | | | | | | | | | | | | | | | git-format-patch-script This is based off of GregKH's script, send-lots-of-email.pl, and strives to do all the nice things a good subsystem maintainer does when forwarding a patch or 50 upstream: All the prior handlers of the patch, as determined by the Signed-off-by: lines, and/or the author of the commit, are cc:ed on the email. All emails are sent as a reply to the previous email, making it easy to skip a collection of emails that are uninteresting. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clean t/trash upon "make clean" as well.Junio C Hamano2005-08-021-0/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 0.99.3v0.99.3Junio C Hamano2005-08-011-1/+1
| | | | | | | | | | Things have slowly but surely started to settle down, and the http transport finally can natively grok packed repositories. To give Pasky a good anchor point, hoping that he can start split off the core part from Cogito, here is the 0.99.3, which will be accompanied with its own tag. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Retire git-fetch-dumb-http and missing-revsJunio C Hamano2005-08-011-3/+2
| | | | | | | Now git-http-pull knows how to do packed repo, retire scripted hacks I placed as a stop-gap measure. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Added hook in git-receive-packJosef Weidendorfer2005-07-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Just before updating a ref, $GIT_DIR/hooks/update refname old-sha1 new-sha1 is called if executable. The hook can decline the ref to be updated by exiting with a non-zero status, or allow it to be updated by exiting with a zero status. The mechanism also allows e.g sending of a mail with pushed commits on the remote repository. Documentation update with an example hook is included. jc: The credits of the basic idea and initial implementation go to Josef, but I ended up rewriting major parts of his patch, so bugs are all mine. Also I changed the semantics for the hook from his original version (which were post-update hook) so that the hook can optionally decline to update the ref, and also can be used to implement the overall cleanups. The latter was primarily to implement a suggestion from Linus that calling update-server-info should be made optional. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add a stupid "count objects" script.Junio C Hamano2005-07-311-0/+2
| | | | | | | | This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fetch from a packed repository on dumb servers.Junio C Hamano2005-07-311-2/+3
| | | | | | | | | | | | Implement fetching from a packed repository over http/https using the dumb server support files. I consider some parts of the logic should be in a separate C program, but it appears to work with my simple tests. I have backburnered it for a bit too long for my liking, so let's throw it out in the open and see what happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status