summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add "unpack-file" helper that unpacks a sha1 blob into a tmpfile.Linus Torvalds2005-04-182-1/+39
* Add more header dependencies.Linus Torvalds2005-04-181-2/+24
* Split up read-cache.c into more logical clumps.Linus Torvalds2005-04-184-271/+288
* Clean up the Makefile a bit.Linus Torvalds2005-04-181-32/+39
* Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds2005-04-183-0/+83
* Merge the new object model thing from Daniel BarkalowLinus Torvalds2005-04-1812-160/+512
|\
| * [PATCH] Switch implementations of merge-base, port to parsingDaniel Barkalow2005-04-182-44/+82
| * [PATCH] Port fsck-cache to use parsing functionsDaniel Barkalow2005-04-182-72/+38
| * [PATCH] Port rev-tree to parsing functionsDaniel Barkalow2005-04-182-48/+38
| * [PATCH] Implementations of parsing functionsDaniel Barkalow2005-04-184-0/+272
| * [PATCH] Header files for object parsingDaniel Barkalow2005-04-184-0/+87
* | [PATCH] fix bug in read-cache.c which loses files when merging a treeJames Bottomley2005-04-181-1/+0
* | [PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths.Junio C Hamano2005-04-181-2/+11
* | Update README to reflect the hierarchical tree objects,Linus Torvalds2005-04-171-109/+401
* | [PATCH] (resend) show-diff.c off-by-one fixJunio C Hamano2005-04-171-2/+2
* | Ass a "merge-cache" helper program to execute a merge onLinus Torvalds2005-04-172-1/+131
* | [PATCH] fork optional branch point normazilationBrad Roberts2005-04-171-3/+3
* | Ignore any unmerged entries for "checkout-cache -a".Linus Torvalds2005-04-171-0/+2
* | Remove extraneous ',' ';' and '.' characters from the full name gecos field.Linus Torvalds2005-04-171-0/+15
* | Make the revision tracking track the object types too.Linus Torvalds2005-04-173-23/+29
* | Make "commit-tree" check the input objects more carefully.Linus Torvalds2005-04-171-0/+14
* | Make "parse_commit" return the "struct revision" for the commit.Linus Torvalds2005-04-172-7/+4
|/
* Do a very simple "merge-base" that finds the most recent commonLinus Torvalds2005-04-172-1/+61
* Make "rev-tree.c" use the new-and-improved "mark_reachable()"Linus Torvalds2005-04-171-16/+1
* Make "revision.h" slightly better to use.Linus Torvalds2005-04-172-7/+11
* Move "parse_commit()" into common revision.h file.Linus Torvalds2005-04-172-79/+40
* [PATCH] fix for memory leak in write-tree.cBrad Roberts2005-04-171-4/+2
* [PATCH] Fix +x-related show-diff false positivesPetr Baudis2005-04-171-1/+1
* [PATCH] Remove unused arguments from index_fd()Junio C Hamano2005-04-171-9/+6
* [PATCH] Better error message from checkout-cache for unmerged files.Junio C Hamano2005-04-171-2/+9
* Fix total permission bogosity in "checkout-cache.c".Linus Torvalds2005-04-171-3/+1
* [PATCH] update-cache --remove marks the path merged.Junio C Hamano2005-04-171-1/+3
* [PATCH] show-diff.c: do not include unused header fileJunio C Hamano2005-04-171-1/+0
* Be much more liberal about the file mode bits.Linus Torvalds2005-04-165-6/+21
* [PATCH] Do not run useless show-diff on unmerged paths repeatedly.Junio C Hamano2005-04-161-0/+13
* [PATCH] show-diff style fix.Junio C Hamano2005-04-161-4/+3
* [PATCH] Rename confusing variable in show-diffJunio C Hamano2005-04-161-4/+4
* [PATCH] show-diff shell safetyJunio C Hamano2005-04-161-4/+60
* [PATCH] show-diff -z option for machine readable output.Junio C Hamano2005-04-161-9/+19
* [PATCH] Optionally tell show-diff to show only named filesJunio C Hamano2005-04-161-8/+30
* [PATCH] Un unoptimize ls-tree behaviourJunio C Hamano2005-04-161-26/+15
* Add "--unmerged" flag to "show-files", which does what the name implies.Linus Torvalds2005-04-161-1/+10
* Remove "merge-tree.c"Linus Torvalds2005-04-162-149/+1
* When inserting a index entry of stage 0, remove all old unmerged entries.Linus Torvalds2005-04-161-5/+31
* Make 'read-tree' do a few more of the trivial merge cases.Linus Torvalds2005-04-161-17/+53
* [PATCH] Add --stage to show-files for new stage dircache.Junio C Hamano2005-04-162-9/+25
* [PATCH] Byteorder fix for read-tree, new -m semantics version.Junio C Hamano2005-04-161-1/+1
* Make "read-tree" merge the trees it reads by giving them consecutive states.Linus Torvalds2005-04-151-6/+53
* Make cache entry comparison take the new "state" flag into account.Linus Torvalds2005-04-152-6/+13
* write-tree: refuse to write out trees with unmerged index entries.Linus Torvalds2005-04-151-0/+18
View Lorry Controller Status