11387 Commits (42b5f8693eddbbd486579fb2304db1bc7282ac26)
 

Author SHA1 Message Date
Junio C Hamano c157d37674 [PATCH] show-diff.c: clean up private buffer use. 20 years ago
Linus Torvalds 00829b5def Add "update-cache --refresh" to git-pull-script to make sure 20 years ago
Linus Torvalds e3b4be7f6c Change merge-cache and git-merge-one-file to use the SHA1 of the file 20 years ago
Linus Torvalds 3407bb4940 Add "unpack-file" helper that unpacks a sha1 blob into a tmpfile. 20 years ago
Linus Torvalds e590d694ea Add more header dependencies. 20 years ago
Linus Torvalds 0fcfd160b0 Split up read-cache.c into more logical clumps. 20 years ago
Linus Torvalds 0a02ce72d9 Clean up the Makefile a bit. 20 years ago
Linus Torvalds 839a7a06f3 Add the simple scripts I used to do a merge with content conflicts. 20 years ago
Linus Torvalds b51ad43140 Merge the new object model thing from Daniel Barkalow 20 years ago
James Bottomley a4b7dbef4e [PATCH] fix bug in read-cache.c which loses files when merging a tree 20 years ago
Daniel Barkalow b5039db6d2 [PATCH] Switch implementations of merge-base, port to parsing 20 years ago
Daniel Barkalow ff5ebe39b0 [PATCH] Port fsck-cache to use parsing functions 20 years ago
Daniel Barkalow 5873b67eef [PATCH] Port rev-tree to parsing functions 20 years ago
Daniel Barkalow 175785e5ff [PATCH] Implementations of parsing functions 20 years ago
Daniel Barkalow 6eb8ae00d4 [PATCH] Header files for object parsing 20 years ago
Junio C Hamano 1bc992acac [PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths. 20 years ago
Linus Torvalds 6ad6d3d36c Update README to reflect the hierarchical tree objects, 20 years ago
Junio C Hamano 64982f7510 [PATCH] (resend) show-diff.c off-by-one fix 20 years ago
Linus Torvalds 75118b13bc Ass a "merge-cache" helper program to execute a merge on 20 years ago
Brad Roberts 74b2428f55 [PATCH] fork optional branch point normazilation 20 years ago
Linus Torvalds d9f98eebcd Ignore any unmerged entries for "checkout-cache -a". 20 years ago
Linus Torvalds 5e5128ed1c Remove extraneous ',' ';' and '.' characters from the full name gecos field. 20 years ago
Linus Torvalds 08ca0b04ba Make the revision tracking track the object types too. 20 years ago
Linus Torvalds d0d7cbe730 Make "commit-tree" check the input objects more carefully. 20 years ago
Linus Torvalds 7d60ad7cc9 Make "parse_commit" return the "struct revision" for the commit. 20 years ago
Linus Torvalds 6683463ed6 Do a very simple "merge-base" that finds the most recent common 20 years ago
Linus Torvalds 15000d7899 Make "rev-tree.c" use the new-and-improved "mark_reachable()" 20 years ago
Linus Torvalds 01796b0e91 Make "revision.h" slightly better to use. 20 years ago
Linus Torvalds 89d21f4b64 Move "parse_commit()" into common revision.h file. 20 years ago
Brad Roberts 7223a88ce7 [PATCH] fix for memory leak in write-tree.c 20 years ago
Petr Baudis e8871e88ad [PATCH] Fix +x-related show-diff false positives 20 years ago
Junio C Hamano c747fc6fac [PATCH] Remove unused arguments from index_fd() 20 years ago
Junio C Hamano a38800fde2 [PATCH] Better error message from checkout-cache for unmerged files. 20 years ago
Linus Torvalds fa06d442c6 Fix total permission bogosity in "checkout-cache.c". 20 years ago
Junio C Hamano c4e3cca1f7 [PATCH] update-cache --remove marks the path merged. 20 years ago
Junio C Hamano 8f41523fc1 [PATCH] show-diff.c: do not include unused header file 20 years ago
Linus Torvalds e44794706e Be much more liberal about the file mode bits. 20 years ago
Junio C Hamano 9fec8b26ef [PATCH] Do not run useless show-diff on unmerged paths repeatedly. 20 years ago
Junio C Hamano d2522a6528 [PATCH] show-diff style fix. 20 years ago
Junio C Hamano b70c8942d3 [PATCH] Rename confusing variable in show-diff 20 years ago
Junio C Hamano 9bd94cafdf [PATCH] show-diff shell safety 20 years ago
Junio C Hamano d94c6128e6 [PATCH] show-diff -z option for machine readable output. 20 years ago
Junio C Hamano b8f80925e3 [PATCH] Optionally tell show-diff to show only named files 20 years ago
Junio C Hamano 0f2303f719 [PATCH] Un unoptimize ls-tree behaviour 20 years ago
Linus Torvalds eec8c633c1 Add "--unmerged" flag to "show-files", which does what the name implies. 20 years ago
Linus Torvalds 2fbdd13174 Remove "merge-tree.c" 20 years ago
Linus Torvalds 7b937ca331 When inserting a index entry of stage 0, remove all old unmerged entries. 20 years ago
Linus Torvalds 43f91266a4 Make 'read-tree' do a few more of the trivial merge cases. 20 years ago
Junio C Hamano aee461985f [PATCH] Add --stage to show-files for new stage dircache. 20 years ago
Junio C Hamano fcf712e60e [PATCH] Byteorder fix for read-tree, new -m semantics version. 20 years ago