aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* GIT 0.99.9j aka 1.0rc3v1.0rc3v0.99.9jJunio C Hamano2005-11-16
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 0.99.9i aka 1.0rc2v1.0rc2v0.99.9iJunio C Hamano2005-11-14
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Update topo-order test.Junio C Hamano2005-11-14
| | | | | | | | | | | | | | | | The recently we updated rev-list --topo-order to show the heads in date order, but we had a test that expected to see the old behaviour. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * allow git-update-ref create refs with slashes in namesAlex Riesen2005-11-14
| | | | | | | | | | | | | | | | | | | | Make git-update-ref create references with slashes in them. git-branch and git-checkout already support such reference names. git-branch can use git-update-ref to create the references in a more formal manner now. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation nitpickingNikolai Weibull2005-11-14
| | | | | | | | | | | | | | This patch fixes some small problems with the documentation. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Document a couple of missing command-line options.Nikolai Weibull2005-11-14
| | | | | | | | | | | | | | This patch adds documentation to quite a few command-line options. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Document the -n command-line option to git-unpack-objectsNikolai Weibull2005-11-14
| | | | | | | | | | | | | | | | This patch documents the -n command-line option to git-unpack-objects, as it was previously undocumented. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * apply: fix binary patch detection.Junio C Hamano2005-11-14
| | | | | | | | | | | | | | | | | | | | The comparison to find "Binary files " string was looking at a wrong place when offset != 0. Also, we may have the full 40-byte textual sha1 on the index line; two off-by-one errors prevented it. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix git-rev-list "date order" with --topo-orderLinus Torvalds2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes git-rev-list so that when there are multiple branches, we still sort the heads in proper approximate date order even when sorting the output topologically. This makes things like gitk --all -d work sanely and show the branches in date order (where "date order" is obviously modified by the paren-child dependency requirements of the topological sort). The trivial fix is to just build the "work" list in date order rather than inserting the new work entries at the beginning. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-branch: Mention -d and -D in man-page.Andreas Ericsson2005-11-14
| | | | | | | | | | Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Merge branch 'svnup' of http://netz.smurf.noris.de/git/gitJunio C Hamano2005-11-14
| |\ | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Depend on asciidoc 7 (at least).Matthias Urlichs2005-11-14
| | |
| * | Remove git-rename. git-mv does the sameJosef Weidendorfer2005-11-14
| | | | | | | | | | | | | | | Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Bugfix: stop if directory already existsJosef Weidendorfer2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo: We do not want to run the directory as command, and want to terminate if the directory exists Additionally, update the usage message Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Separate LDFLAGS and CFLAGS.Junio C Hamano2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | Stuffing -L flag and friends meant for the linking phase into ALL_CFLAGS is not right; honor LDFLAGS and introduce ALL_LDFLAGS to separate them out. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Merge branch 'svnup' of http://netz.smurf.noris.de/git/gitJunio C Hamano2005-11-14
| |\ \ | | |/
| | * Remove trailing slashesMatthias Urlichs2005-11-14
| | | | | | | | | | | | SVN dies a messy death when passed a path with trailing slashes.
| | * debian packaging: git-cvs needs cvspsMatthias Urlichs2005-11-12
| | |
| * | Rename lost+found to lost-found.Junio C Hamano2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | Because we use "lost-found" as the directory name to hold dangling object names, it is confusing to call the command git-lost+found, although it makes sense and is even cute ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Fix compilation warnings in pack-redundant.cKai Ruemmler2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | This fixes compilation warnings where "%ld" was used to print values of type size_t. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Debian: build-depend on libexpat-dev.Junio C Hamano2005-11-13
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Split gitk into seperate RPM packageThomas Matysik2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't want to have to install x11-libs and all it's dependencies on my headless machines, so this patch splits gitk out of the RPM. The .deb already appears to have gitk split out. Signed-off-by: Thomas Matysik <thomas@matysik.co.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Add expat and expat-devel dependencies (for http-push) to RPM spec.Thomas Matysik2005-11-13
| | | | | | | | | | | | | | | Signed-off-by: Thomas Matysik <thomas@matysik.co.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Fix fd leak in http-fetchNick Hengeveld2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | Added a call to finish_request to clean up resources if the server returned a 404 and there are no alternates left to try. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Fix for multiple alternates requests in http-fetchNick Hengeveld2005-11-12
| |/ | | | | | | | | | | | | | | | | Stop additional alternates requests from starting if one is already in progress. This adds an optional callback which is processed after a slot has finished running. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9hv1.0rc1v0.99.9hJunio C Hamano2005-11-11
|\ \ | |/ | | | | | | | | | | | | This is GIT 1.0-rc1 in disguise. It is plausible that relatively new parts of the system still need tweaking and fixing, but that is why it is not 1.0 but rc ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Ignore built git-lost+found.Junio C Hamano2005-11-11
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: asciidoc sources are utf-8Junio C Hamano2005-11-11
| | | | | | | | | | | | | | | | | | | | | | git-pack-redundant documentation was encoded in latin1, which caused asciidoc to barf, which expected to see utf-8. Run tcs to re-encode it in utf-8. Also just for fun try my name in Japanese in git-lost+found documentation ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Rename .git/lost+found to .git/lost-found.Junio C Hamano2005-11-11
| | | | | | | | | | | | | | | | | | | | Just to avoid confusion that scripts poorly written by somebody else ;-) might mistake this as a mount point, or backup tools ignoring the directory. The latter is probably not a big loss, however, considering that this directory's contents are to be used while fresh anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-lost+foundJunio C Hamano2005-11-11
| | | | | | | | | | | | This command helps you resurrect accidentally lost tags and commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-prune: prune redundant packsJunio C Hamano2005-11-11
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make git-pack-redundant consider alt-odbsLukas_Sandström2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes git-pack-redundant so that packfiles in alternate object directories also are considered when deciding which objects are redundant. This functionality is controlled by the flag '--alt-odb'. Also convert the other flags to the long form, and update docs and git-repack accordingly. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Rename git-pack-intersect to git-pack-redundantLukas_Sandström2005-11-11
| | | | | | | | | | | | | | | | | | | | | | This patch renames git-pack-intersect to git-pack-redundant as suggested by Petr Baudis. The new name reflects what the program does, rather than how it does it. Also fix a small argument parsing bug. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make git-repack use git-pack-intersect.Lukas_Sandström2005-11-11
| | | | | | | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add git-pack-intersect to .gitignoreLukas_Sandström2005-11-11
| | | | | | | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add documentation for git-pack-intersectLukas_Sandström2005-11-11
| | | | | | | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add git-pack-intersectLukas_Sandström2005-11-11
| | | | | | | | | | | | | | | | This patch adds the program git-pack-intersect. It is used to find redundant packs in git repositories. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * merge-one-file: use empty- or common-base condintionally in two-stage merge.Junio C Hamano2005-11-11
| | | | | | | | | | | | | | | | If two sides added the same path completely different thing, it is easier to see the merge pivoting on /dev/null. So check the size of the common section we have found, and empty it if it is too small. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: git-apply --no-addJunio C Hamano2005-11-11
| | | | | | | | | | | | | | This is a specialized hack to help no-base merges, but other people might find it useful, so let's document it. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * merge-one-file: use common as base, instead of emptiness.Junio C Hamano2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the previous round that merged the path added differently in each branches using emptiness as the base, compute a common version and use it as input to 'merge' program. This would show the resulting (still conflicting) file left in the working tree as: common file contents... <<<<<< FILENAME version from our branch... ====== version from their branch... >>>>>> .merge_file_XXXXXX more common file contents... when both sides added similar contents. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * merge with /dev/null as base, instead of punting O==empty caseJunio C Hamano2005-11-11
| | | | | | | | | | | | | | | | | | Instead of leaving the path unmerged in a case where each side adds different version of the same path, attempt to merge it with empty base and leave "our" version in the index file, just like we do for the case in conflicting merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Show URL in the "Getting <foo> list" http-fetch messagesPetr Baudis2005-11-11
| | | | | | | | | | Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * merge-recursive: Use '~' instead of '_' to separate file names from branch namesFredrik Kuivinen2005-11-11
| | | | | | | | | | | | | | | | Makes it less probable that we get a clash with an existing file, furthermore Cogito already uses '~' for this purpose. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * merge-recursive: Add copyright noticeFredrik Kuivinen2005-11-11
| | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * merge-recursive: Indent the output properlyFredrik Kuivinen2005-11-11
| | | | | | | | | | | | | | | | If we have multiple common ancestors and have to recursively merge them then the output will be much more readable with this commit. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Change 'cache' to 'index' in the docsLukas_Sandström2005-11-11
| | | | | | | | | | | | | | | | | | This patch makes the documentation refer to the index as index instead of cache, but some references still remain. (e.g. git-update-index.txt) Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * INSTALL: duplicate python requirements from MakefileJunio C Hamano2005-11-11
| | | | | | | | | | | | | | ... and refer the reader to Makefile for other things that can be tweaked. Signed-off-by: Junio C Hamano <junkio@cox.net>
| *-. Merge branches 'jc/sb' and 'jc/mb'Junio C Hamano2005-11-11
| |\ \
| | | * Add test case for merge-base.Junio C Hamano2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although it was shown that the "full contamination" was not really full during the list discussion, the series improves things without incurring extra parsing cost, and here is a test to check that. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | | * merge-base: avoid unnecessary postprocessing.Junio C Hamano2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have only one merge-base candidates in the result list, there is no point going back to mark the reachable commits again. And that is the most common case, so try not to waste time on it. Suggested by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-13 12:45:48 +0000