Commit Graph

  • 3407bb4940 Add "unpack-file" helper that unpacks a sha1 blob into a tmpfile. Linus Torvalds 2005-04-18 14:11:01 -0700
  • e590d694ea Add more header dependencies. Linus Torvalds 2005-04-18 13:12:21 -0700
  • 0fcfd160b0 Split up read-cache.c into more logical clumps. Linus Torvalds 2005-04-18 13:04:43 -0700
  • 0a02ce72d9 Clean up the Makefile a bit. Linus Torvalds 2005-04-18 12:49:39 -0700
  • 839a7a06f3 Add the simple scripts I used to do a merge with content conflicts. Linus Torvalds 2005-04-18 12:15:10 -0700
  • b51ad43140 Merge the new object model thing from Daniel Barkalow Linus Torvalds 2005-04-18 12:12:00 -0700
  • a4b7dbef4e [PATCH] fix bug in read-cache.c which loses files when merging a tree James Bottomley 2005-04-18 11:44:31 -0700
  • b5039db6d2 [PATCH] Switch implementations of merge-base, port to parsing Daniel Barkalow 2005-04-18 11:39:48 -0700
  • ff5ebe39b0 [PATCH] Port fsck-cache to use parsing functions Daniel Barkalow 2005-04-18 11:39:48 -0700
  • 5873b67eef [PATCH] Port rev-tree to parsing functions Daniel Barkalow 2005-04-18 11:39:48 -0700
  • 175785e5ff [PATCH] Implementations of parsing functions Daniel Barkalow 2005-04-18 11:39:48 -0700
  • 6eb8ae00d4 [PATCH] Header files for object parsing Daniel Barkalow 2005-04-18 11:39:48 -0700
  • 1bc992acac [PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths. Junio C Hamano 2005-04-18 10:42:48 -0700
  • 6ad6d3d36c Update README to reflect the hierarchical tree objects, and other newfangled things like merging. Linus Torvalds 2005-04-17 21:52:23 -0700
  • 64982f7510 [PATCH] (resend) show-diff.c off-by-one fix Junio C Hamano 2005-04-17 20:31:40 -0700
  • 75118b13bc Ass a "merge-cache" helper program to execute a merge on any unmerged files. Linus Torvalds 2005-04-17 19:52:54 -0700
  • 74b2428f55 [PATCH] fork optional branch point normazilation Brad Roberts 2005-04-17 19:12:14 -0700
  • d9f98eebcd Ignore any unmerged entries for "checkout-cache -a". Linus Torvalds 2005-04-17 18:39:14 -0700
  • 5e5128ed1c Remove extraneous ',' ';' and '.' characters from the full name gecos field. Linus Torvalds 2005-04-17 16:52:54 -0700
  • 08ca0b04ba Make the revision tracking track the object types too. Linus Torvalds 2005-04-17 16:19:32 -0700
  • d0d7cbe730 Make "commit-tree" check the input objects more carefully. Linus Torvalds 2005-04-17 15:26:13 -0700
  • 7d60ad7cc9 Make "parse_commit" return the "struct revision" for the commit. Linus Torvalds 2005-04-17 12:40:18 -0700
  • 6683463ed6 Do a very simple "merge-base" that finds the most recent common parent of two commits. Linus Torvalds 2005-04-17 12:18:17 -0700
  • 15000d7899 Make "rev-tree.c" use the new-and-improved "mark_reachable()" Linus Torvalds 2005-04-17 12:09:20 -0700
  • 01796b0e91 Make "revision.h" slightly better to use. Linus Torvalds 2005-04-17 12:07:00 -0700
  • 89d21f4b64 Move "parse_commit()" into common revision.h file. Linus Torvalds 2005-04-17 11:39:18 -0700
  • 7223a88ce7 [PATCH] fix for memory leak in write-tree.c Brad Roberts 2005-04-17 10:55:12 -0700
  • e8871e88ad [PATCH] Fix +x-related show-diff false positives Petr Baudis 2005-04-17 10:04:48 -0700
  • c747fc6fac [PATCH] Remove unused arguments from index_fd() Junio C Hamano 2005-04-17 10:02:22 -0700
  • a38800fde2 [PATCH] Better error message from checkout-cache for unmerged files. Junio C Hamano 2005-04-17 10:02:21 -0700
  • fa06d442c6 Fix total permission bogosity in "checkout-cache.c". Linus Torvalds 2005-04-17 09:55:36 -0700
  • c4e3cca1f7 [PATCH] update-cache --remove marks the path merged. Junio C Hamano 2005-04-17 09:53:35 -0700
  • 8f41523fc1 [PATCH] show-diff.c: do not include unused header file Junio C Hamano 2005-04-17 09:53:35 -0700
  • e44794706e Be much more liberal about the file mode bits. Linus Torvalds 2005-04-16 22:26:31 -0700
  • 9fec8b26ef [PATCH] Do not run useless show-diff on unmerged paths repeatedly. Junio C Hamano 2005-04-16 21:29:45 -0700
  • d2522a6528 [PATCH] show-diff style fix. Junio C Hamano 2005-04-16 21:29:45 -0700
  • b70c8942d3 [PATCH] Rename confusing variable in show-diff Junio C Hamano 2005-04-16 21:29:45 -0700
  • 9bd94cafdf [PATCH] show-diff shell safety Junio C Hamano 2005-04-16 21:29:45 -0700
  • d94c6128e6 [PATCH] show-diff -z option for machine readable output. Junio C Hamano 2005-04-16 21:29:45 -0700
  • b8f80925e3 [PATCH] Optionally tell show-diff to show only named files Junio C Hamano 2005-04-16 21:29:45 -0700
  • 0f2303f719 [PATCH] Un unoptimize ls-tree behaviour Junio C Hamano 2005-04-16 13:57:39 -0700
  • eec8c633c1 Add "--unmerged" flag to "show-files", which does what the name implies. Linus Torvalds 2005-04-16 12:43:32 -0700
  • 2fbdd13174 Remove "merge-tree.c" Linus Torvalds 2005-04-16 12:24:12 -0700
  • 7b937ca331 When inserting a index entry of stage 0, remove all old unmerged entries. Linus Torvalds 2005-04-16 12:05:45 -0700
  • 43f91266a4 Make 'read-tree' do a few more of the trivial merge cases. Linus Torvalds 2005-04-16 09:11:49 -0700
  • aee461985f [PATCH] Add --stage to show-files for new stage dircache. Junio C Hamano 2005-04-16 08:33:23 -0700
  • fcf712e60e [PATCH] Byteorder fix for read-tree, new -m semantics version. Junio C Hamano 2005-04-16 08:30:20 -0700
  • d99082e0e3 Make "read-tree" merge the trees it reads by giving them consecutive states. Linus Torvalds 2005-04-15 22:53:45 -0700
  • 95fd5bf82a Make cache entry comparison take the new "state" flag into account. Linus Torvalds 2005-04-15 22:51:44 -0700
  • c347ea5d6f write-tree: refuse to write out trees with unmerged index entries. Linus Torvalds 2005-04-15 22:04:54 -0700
  • f5cabd13d8 Encode a few extra flags per index entry. Linus Torvalds 2005-04-15 21:45:38 -0700
  • 13e897e580 Simplify show-diff cache entry name handling. Linus Torvalds 2005-04-15 21:42:34 -0700
  • d07f651c25 [PATCH] Add '-z' to merge-tree.c Junio C Hamano 2005-04-15 19:20:42 -0700
  • 6cbd72f8d5 Make "diff-tree" have similar behaviour as "ls-tree" wrt line termination. Linus Torvalds 2005-04-15 15:11:57 -0700
  • ca2a079865 [PATCH] Add "-q" option to show-diff.c Junio C Hamano 2005-04-15 15:08:09 -0700
  • b83c83457e [PATCH] Add -z option to show-files Junio C Hamano 2005-04-15 11:11:01 -0700
  • 9945d98051 Add "--cacheinfo" option to update-cache. Linus Torvalds 2005-04-15 11:08:33 -0700
  • ccc4feb579 Convert the index file reading/writing to use network byte order. Linus Torvalds 2005-04-15 10:44:27 -0700
  • 27de946d0e [PATCH] Simplify date handling and make it more reliable David Woodhouse 2005-04-15 08:39:57 -0700
  • aa1c48df81 [PATCH] ls-tree enhancements Junio C Hamano 2005-04-15 08:37:05 -0700
  • 33deb63a36 Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful. Linus Torvalds 2005-04-14 01:37:23 -0700
  • 458754a9fe Use common "revision.h" header for both fsck and rev-tree. Linus Torvalds 2005-04-13 21:37:59 -0700
  • f864ba7448 Fix read-cache.c collission check logic. Linus Torvalds 2005-04-13 17:47:12 -0700
  • bcee6fd8e7 Make 'fsck' able to take an arbitrary number of parents on the command line. Linus Torvalds 2005-04-13 16:42:09 -0700
  • 2845dbe4a4 Make fsck reachability avoid doing unnecessary work for parents that we reach multiple ways. Linus Torvalds 2005-04-13 12:35:08 -0700
  • d9839e0305 Make "fsck-cache" use the same revision tracking structure as "rev-tree". Linus Torvalds 2005-04-13 09:57:30 -0700
  • 33b238d128 [PATCH] Change diff-tree output format Petr Baudis 2005-04-13 02:42:04 -0700
  • 35bb47855d [PATCH] diff-tree usage Petr Baudis 2005-04-13 02:39:33 -0700
  • 5ade862839 [PATCH] nsec portability Petr Baudis 2005-04-13 02:38:44 -0700
  • aebb267908 [PATCH] Whitespace Fixes Ingo Molnar 2005-04-12 11:36:26 -0700
  • 42d545e8ff [PATCH] No need to clean temp_git_file_* anymore Junio C Hamano 2005-04-12 08:08:12 -0700
  • 31cedfb95e [PATCH] Typofix in git/show-files. Junio C Hamano 2005-04-12 08:04:17 -0700
  • 2de381f919 [PATCH] Consolidate the error handling Petr Baudis 2005-04-13 02:28:48 -0700
  • bdd4da595a [PATCH] Make nsec checking optional Petr Baudis 2005-04-13 02:20:38 -0700
  • 5c2a7fbc36 [PATCH] SHA1 naive collision checking Petr Baudis 2005-04-13 02:14:06 -0700
  • 7912c07037 [PATCH] ls-tree for listing trees Petr Baudis 2005-04-13 02:02:34 -0700
  • c57a3a91f1 [PATCH] Correct show-diff output for deleted files Petr Baudis 2005-04-13 01:46:35 -0700
  • e2e5e98a40 [PATCH] Silent flag for show-diff Petr Baudis 2005-04-13 01:40:09 -0700
  • 3d8c7a5790 [PATCH] Fix a crash when doing rev-tree Petr Baudis 2005-04-12 14:37:42 -0700
  • 29d76d4b05 Make "checkout-cache" silently skip up-to-date files. Linus Torvalds 2005-04-12 14:17:28 -0700
  • 40e88b95cd Make "rev-tree" able to read its own output again from the cache. Linus Torvalds 2005-04-12 13:40:03 -0700
  • 727ff27787 [PATCH] rev-tree support for "in X but not in Y". David Woodhouse 2005-04-12 12:35:11 -0700
  • c0fb976aa7 [PATCH] show-diff show deleted files as diff as well. Christopher Li 2005-04-12 02:04:44 -0700
  • 5e76011c0d Remove the annoying "ok" printout from show-diff. Linus Torvalds 2005-04-12 02:01:12 -0700
  • 853916ff7f Add "applypatch" and "dotest" scripts to tie it all together. Linus Torvalds 2005-04-12 01:40:20 -0700
  • 74b46e32cb Add a "check-files" command, which is useful for scripting patches. Linus Torvalds 2005-04-12 00:23:14 -0700
  • 2744b2344d Start of early patch applicator tools for git. Linus Torvalds 2005-04-11 23:46:50 -0700
  • 8695c8bfe1 Add "show-files" command to show the list of managed (or non-managed) files. Linus Torvalds 2005-04-11 18:55:38 -0700
  • 3607c27f5f Allow zero-sized files to be checked in. Linus Torvalds 2005-04-11 18:02:00 -0700
  • 771364af0e Make the rev-tree output more regular. This is the last change. Promise. Linus Torvalds 2005-04-11 17:40:58 -0700
  • 28258afe91 Make "rev-tree" capable of showing the difference in reachability between two or more commit points. Linus Torvalds 2005-04-11 17:23:58 -0700
  • 97d9c3cdea Make "rev-tree" more efficient and more useful. Linus Torvalds 2005-04-11 16:42:13 -0700
  • 4bb04f2190 Rename ".dircache" directory to ".git" Linus Torvalds 2005-04-11 15:47:57 -0700
  • 9614b8dcf8 Fix stale index.lock file removal using "atexit()". Linus Torvalds 2005-04-11 15:39:26 -0700
  • 84fe972055 Add a "rev-tree" helper, which calculates the revision tree graph. Linus Torvalds 2005-04-11 13:55:10 -0700
  • 0dcad32ae2 Fix "usage()" to do the missing line termination. Linus Torvalds 2005-04-11 13:53:49 -0700
  • 32d197f18d Fix "update-cache" not fixing up the size field as appropriate. Linus Torvalds 2005-04-11 11:33:58 -0700
  • cfd88e2b7a Make the default directory permissions more lax. Linus Torvalds 2005-04-11 10:24:41 -0700
  • 075b845a85 Add a COPYING notice, making it explicit that the license is GPLv2. Linus Torvalds 2005-04-11 10:18:16 -0700
  • 711cf3a026 Make "update-cache --refresh" do what it really should do: just refresh the "stat" information. Linus Torvalds 2005-04-11 09:39:21 -0700