* 839a7a06f - Mon, 18 Apr 2005 12:15:10 -0700  Add the simple scripts I used to do a merge with content conflicts. - Linus Torvalds
*   b51ad4314 - Mon, 18 Apr 2005 12:12:00 -0700  Merge the new object model thing from Daniel Barkalow - Linus Torvalds
|\  
| * b5039db6d - Mon, 18 Apr 2005 11:39:48 -0700  [PATCH] Switch implementations of merge-base, port to parsing - Daniel Barkalow
| * ff5ebe39b - Mon, 18 Apr 2005 11:39:48 -0700  [PATCH] Port fsck-cache to use parsing functions - Daniel Barkalow
| * 5873b67ee - Mon, 18 Apr 2005 11:39:48 -0700  [PATCH] Port rev-tree to parsing functions - Daniel Barkalow
| * 175785e5f - Mon, 18 Apr 2005 11:39:48 -0700  [PATCH] Implementations of parsing functions - Daniel Barkalow
| * 6eb8ae00d - Mon, 18 Apr 2005 11:39:48 -0700  [PATCH] Header files for object parsing - Daniel Barkalow
* | a4b7dbef4 - Mon, 18 Apr 2005 11:44:31 -0700  [PATCH] fix bug in read-cache.c which loses files when merging a tree - James Bottomley
* | 1bc992aca - Mon, 18 Apr 2005 10:42:48 -0700  [PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths. - Junio C Hamano
* | 6ad6d3d36 - Sun, 17 Apr 2005 21:52:23 -0700  Update README to reflect the hierarchical tree objects, and other newfangled things like merging. - Linus Torvalds
* | 64982f751 - Sun, 17 Apr 2005 20:31:40 -0700  [PATCH] (resend) show-diff.c off-by-one fix - Junio C Hamano
* | 75118b13b - Sun, 17 Apr 2005 19:52:54 -0700  Ass a "merge-cache" helper program to execute a merge on any unmerged files. - Linus Torvalds
* | 74b2428f5 - Sun, 17 Apr 2005 19:12:14 -0700  [PATCH] fork optional branch point normazilation - Brad Roberts
* | d9f98eebc - Sun, 17 Apr 2005 18:39:14 -0700  Ignore any unmerged entries for "checkout-cache -a". - Linus Torvalds
* | 5e5128ed1 - Sun, 17 Apr 2005 16:52:54 -0700  Remove extraneous ',' ';' and '.' characters from the full name gecos field. - Linus Torvalds
* | 08ca0b04b - Sun, 17 Apr 2005 16:19:32 -0700  Make the revision tracking track the object types too. - Linus Torvalds
* | d0d7cbe73 - Sun, 17 Apr 2005 15:26:13 -0700  Make "commit-tree" check the input objects more carefully. - Linus Torvalds
* | 7d60ad7cc - Sun, 17 Apr 2005 12:40:18 -0700  Make "parse_commit" return the "struct revision" for the commit. - Linus Torvalds
|/  
* 6683463ed - Sun, 17 Apr 2005 12:18:17 -0700  Do a very simple "merge-base" that finds the most recent common parent of two commits. - Linus Torvalds
* 15000d789 - Sun, 17 Apr 2005 12:09:20 -0700  Make "rev-tree.c" use the new-and-improved "mark_reachable()" - Linus Torvalds
* 01796b0e9 - Sun, 17 Apr 2005 12:07:00 -0700  Make "revision.h" slightly better to use. - Linus Torvalds
* 89d21f4b6 - Sun, 17 Apr 2005 11:39:18 -0700  Move "parse_commit()" into common revision.h file. - Linus Torvalds
* 7223a88ce - Sun, 17 Apr 2005 10:55:12 -0700  [PATCH] fix for memory leak in write-tree.c - Brad Roberts
* e8871e88a - Sun, 17 Apr 2005 10:04:48 -0700  [PATCH] Fix +x-related show-diff false positives - Petr Baudis
* c747fc6fa - Sun, 17 Apr 2005 10:02:22 -0700  [PATCH] Remove unused arguments from index_fd() - Junio C Hamano
* a38800fde - Sun, 17 Apr 2005 10:02:21 -0700  [PATCH] Better error message from checkout-cache for unmerged files. - Junio C Hamano
* fa06d442c - Sun, 17 Apr 2005 09:55:36 -0700  Fix total permission bogosity in "checkout-cache.c". - Linus Torvalds
* c4e3cca1f - Sun, 17 Apr 2005 09:53:35 -0700  [PATCH] update-cache --remove marks the path merged. - Junio C Hamano
* 8f41523fc - Sun, 17 Apr 2005 09:53:35 -0700  [PATCH] show-diff.c: do not include unused header file - Junio C Hamano
* e44794706 - Sat, 16 Apr 2005 22:26:31 -0700  Be much more liberal about the file mode bits. - Linus Torvalds
* 9fec8b26e - Sat, 16 Apr 2005 21:29:45 -0700  [PATCH] Do not run useless show-diff on unmerged paths repeatedly. - Junio C Hamano
* d2522a652 - Sat, 16 Apr 2005 21:29:45 -0700  [PATCH] show-diff style fix. - Junio C Hamano
* b70c8942d - Sat, 16 Apr 2005 21:29:45 -0700  [PATCH] Rename confusing variable in show-diff - Junio C Hamano
* 9bd94cafd - Sat, 16 Apr 2005 21:29:45 -0700  [PATCH] show-diff shell safety - Junio C Hamano
* d94c6128e - Sat, 16 Apr 2005 21:29:45 -0700  [PATCH] show-diff -z option for machine readable output. - Junio C Hamano
* b8f80925e - Sat, 16 Apr 2005 21:29:45 -0700  [PATCH] Optionally tell show-diff to show only named files - Junio C Hamano
* 0f2303f71 - Sat, 16 Apr 2005 13:57:39 -0700  [PATCH] Un unoptimize ls-tree behaviour - Junio C Hamano
* eec8c633c - Sat, 16 Apr 2005 12:43:32 -0700  Add "--unmerged" flag to "show-files", which does what the name implies. - Linus Torvalds
* 2fbdd1317 - Sat, 16 Apr 2005 12:24:12 -0700  Remove "merge-tree.c" - Linus Torvalds
* 7b937ca33 - Sat, 16 Apr 2005 12:05:45 -0700  When inserting a index entry of stage 0, remove all old unmerged entries. - Linus Torvalds
* 43f91266a - Sat, 16 Apr 2005 09:11:49 -0700  Make 'read-tree' do a few more of the trivial merge cases. - Linus Torvalds
* aee461985 - Sat, 16 Apr 2005 08:33:23 -0700  [PATCH] Add --stage to show-files for new stage dircache. - Junio C Hamano
* fcf712e60 - Sat, 16 Apr 2005 08:30:20 -0700  [PATCH] Byteorder fix for read-tree, new -m semantics version. - Junio C Hamano
* d99082e0e - Fri, 15 Apr 2005 22:53:45 -0700  Make "read-tree" merge the trees it reads by giving them consecutive states. - Linus Torvalds
* 95fd5bf82 - Fri, 15 Apr 2005 22:51:44 -0700  Make cache entry comparison take the new "state" flag into account. - Linus Torvalds
* c347ea5d6 - Fri, 15 Apr 2005 22:04:54 -0700  write-tree: refuse to write out trees with unmerged index entries. - Linus Torvalds
* f5cabd13d - Fri, 15 Apr 2005 21:45:38 -0700  Encode a few extra flags per index entry. - Linus Torvalds
* 13e897e58 - Fri, 15 Apr 2005 21:42:34 -0700  Simplify show-diff cache entry name handling. - Linus Torvalds
* d07f651c2 - Fri, 15 Apr 2005 19:20:42 -0700  [PATCH] Add '-z' to merge-tree.c - Junio C Hamano
* 6cbd72f8d - Fri, 15 Apr 2005 15:11:57 -0700  Make "diff-tree" have similar behaviour as "ls-tree" wrt line termination. - Linus Torvalds
* ca2a07986 - Fri, 15 Apr 2005 15:08:09 -0700  [PATCH] Add "-q" option to show-diff.c - Junio C Hamano
* b83c83457 - Fri, 15 Apr 2005 11:11:01 -0700  [PATCH] Add -z option to show-files - Junio C Hamano
* 9945d9805 - Fri, 15 Apr 2005 11:08:33 -0700  Add "--cacheinfo" option to update-cache. - Linus Torvalds
* ccc4feb57 - Fri, 15 Apr 2005 10:44:27 -0700  Convert the index file reading/writing to use network byte order. - Linus Torvalds
* 27de946d0 - Fri, 15 Apr 2005 08:39:57 -0700  [PATCH] Simplify date handling and make it more reliable - David Woodhouse
* aa1c48df8 - Fri, 15 Apr 2005 08:37:05 -0700  [PATCH] ls-tree enhancements - Junio C Hamano
* 33deb63a3 - Thu, 14 Apr 2005 01:37:23 -0700  Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful. - Linus Torvalds
* 458754a9f - Wed, 13 Apr 2005 21:37:59 -0700  Use common "revision.h" header for both fsck and rev-tree. - Linus Torvalds
* f864ba744 - Wed, 13 Apr 2005 17:47:12 -0700  Fix read-cache.c collission check logic. - Linus Torvalds
* bcee6fd8e - Wed, 13 Apr 2005 16:42:09 -0700  Make 'fsck' able to take an arbitrary number of parents on the command line. - Linus Torvalds
* 2845dbe4a - Wed, 13 Apr 2005 12:35:08 -0700  Make fsck reachability avoid doing unnecessary work for parents that we reach multiple ways. - Linus Torvalds
* d9839e030 - Wed, 13 Apr 2005 09:57:30 -0700  Make "fsck-cache" use the same revision tracking structure as "rev-tree". - Linus Torvalds
* 33b238d12 - Wed, 13 Apr 2005 02:42:04 -0700  [PATCH] Change diff-tree output format - Petr Baudis
* 35bb47855 - Wed, 13 Apr 2005 02:39:33 -0700  [PATCH] diff-tree usage - Petr Baudis
* 5ade86283 - Wed, 13 Apr 2005 02:38:44 -0700  [PATCH] nsec portability - Petr Baudis
* aebb26790 - Tue, 12 Apr 2005 11:36:26 -0700  [PATCH] Whitespace Fixes - Ingo Molnar
* 42d545e8f - Tue, 12 Apr 2005 08:08:12 -0700  [PATCH] No need to clean temp_git_file_* anymore - Junio C Hamano
* 31cedfb95 - Tue, 12 Apr 2005 08:04:17 -0700  [PATCH] Typofix in git/show-files. - Junio C Hamano
* 2de381f91 - Wed, 13 Apr 2005 02:28:48 -0700  [PATCH] Consolidate the error handling - Petr Baudis
* bdd4da595 - Wed, 13 Apr 2005 02:20:38 -0700  [PATCH] Make nsec checking optional - Petr Baudis
* 5c2a7fbc3 - Wed, 13 Apr 2005 02:14:06 -0700  [PATCH] SHA1 naive collision checking - Petr Baudis
* 7912c0703 - Wed, 13 Apr 2005 02:02:34 -0700  [PATCH] ls-tree for listing trees - Petr Baudis
* c57a3a91f - Wed, 13 Apr 2005 01:46:35 -0700  [PATCH] Correct show-diff output for deleted files - Petr Baudis
* e2e5e98a4 - Wed, 13 Apr 2005 01:40:09 -0700  [PATCH] Silent flag for show-diff - Petr Baudis
* 3d8c7a579 - Tue, 12 Apr 2005 14:37:42 -0700  [PATCH] Fix a crash when doing rev-tree - Petr Baudis
* 29d76d4b0 - Tue, 12 Apr 2005 14:17:28 -0700  Make "checkout-cache" silently skip up-to-date files. - Linus Torvalds
* 40e88b95c - Tue, 12 Apr 2005 13:40:03 -0700  Make "rev-tree" able to read its own output again from the cache. - Linus Torvalds
* 727ff2778 - Tue, 12 Apr 2005 12:35:11 -0700  [PATCH] rev-tree support for "in X but not in Y". - David Woodhouse
* c0fb976aa - Tue, 12 Apr 2005 02:04:44 -0700  [PATCH] show-diff show deleted files as diff as well. - Christopher Li
* 5e76011c0 - Tue, 12 Apr 2005 02:01:12 -0700  Remove the annoying "ok" printout from show-diff. - Linus Torvalds
* 74b46e32c - Tue, 12 Apr 2005 00:23:14 -0700  Add a "check-files" command, which is useful for scripting patches. - Linus Torvalds
* 8695c8bfe - Mon, 11 Apr 2005 18:55:38 -0700  Add "show-files" command to show the list of managed (or non-managed) files. - Linus Torvalds
* 3607c27f5 - Mon, 11 Apr 2005 18:02:00 -0700  Allow zero-sized files to be checked in. - Linus Torvalds
* 771364af0 - Mon, 11 Apr 2005 17:40:58 -0700  Make the rev-tree output more regular. This is the last change. Promise. - Linus Torvalds
* 28258afe9 - Mon, 11 Apr 2005 17:23:58 -0700  Make "rev-tree" capable of showing the difference in reachability between two or more commit points. - Linus Torvalds
* 97d9c3cde - Mon, 11 Apr 2005 16:42:13 -0700  Make "rev-tree" more efficient and more useful. - Linus Torvalds
* 4bb04f219 - Mon, 11 Apr 2005 15:47:57 -0700  Rename ".dircache" directory to ".git" - Linus Torvalds
* 9614b8dcf - Mon, 11 Apr 2005 15:39:26 -0700  Fix stale index.lock file removal using "atexit()". - Linus Torvalds
* 84fe97205 - Mon, 11 Apr 2005 13:55:10 -0700  Add a "rev-tree" helper, which calculates the revision tree graph. - Linus Torvalds
* 0dcad32ae - Mon, 11 Apr 2005 13:53:49 -0700  Fix "usage()" to do the missing line termination. - Linus Torvalds
* 32d197f18 - Mon, 11 Apr 2005 11:33:58 -0700  Fix "update-cache" not fixing up the size field as appropriate. - Linus Torvalds
* cfd88e2b7 - Mon, 11 Apr 2005 10:24:41 -0700  Make the default directory permissions more lax. - Linus Torvalds
* 075b845a8 - Mon, 11 Apr 2005 10:18:16 -0700  Add a COPYING notice, making it explicit that the license is GPLv2. - Linus Torvalds
* 711cf3a02 - Mon, 11 Apr 2005 09:39:21 -0700  Make "update-cache --refresh" do what it really should do: just refresh the "stat" information. - Linus Torvalds
* bf16c71e2 - Mon, 11 Apr 2005 08:37:17 -0700  Fix up commit-tree/diff-tree user interface issues. - Linus Torvalds
* 91af81a98 - Sun, 10 Apr 2005 23:33:52 -0700  Oops. Fix bad initialization of the "seen" array, causing us to not properly clear the reference count at init time. It happened to work for me by pure luck. - Linus Torvalds
* f1257f3a3 - Sun, 10 Apr 2005 23:22:59 -0700  Oops, the actual 'printf' for missing objects was missing. - Linus Torvalds
* 8ba0bbb23 - Sun, 10 Apr 2005 23:13:09 -0700  Add connectivity tracking to fsck. - Linus Torvalds
* 76e7f4ec4 - Sun, 10 Apr 2005 22:06:50 -0700  Fix off-by-one error in removal of cache entry. - Linus Torvalds
* 262e82b4a - Sun, 10 Apr 2005 21:49:26 -0700  Fix diff-tree recursion. - Linus Torvalds
* eeb799169 - Sun, 10 Apr 2005 15:08:02 -0700  Simplify "diff-tree" output, and only keep track of one single name-base. - Linus Torvalds
* 73134b6d3 - Sun, 10 Apr 2005 14:03:58 -0700  Add "-R" flag to "diff-tree", so that it will recursively traverse a tree of trees as it diffs them. - Linus Torvalds
* 121481abf - Sun, 10 Apr 2005 11:32:54 -0700  Make "update-cache" a bit friendlier to use (and harder to mis-use). - Linus Torvalds
* d6d3f9d01 - Sat, 9 Apr 2005 17:09:34 -0700  This implements the new "recursive tree" write-tree. - Linus Torvalds
* 4e6616ab7 - Sat, 9 Apr 2005 15:47:03 -0700  Make fsck-cache warn about old-style tree objects that have full pathnames in them. We're migrating away from that. - Linus Torvalds
* f768846e3 - Sat, 9 Apr 2005 15:36:41 -0700  Teach "fsck" and "read-tree" about recursive tree-nodes. - Linus Torvalds
* 16d4d1ba6 - Sat, 9 Apr 2005 13:02:30 -0700  Make "fsck-cache" print out all the root commits it finds. - Linus Torvalds
* 9174026cf - Sat, 9 Apr 2005 13:00:54 -0700  Add "diff-tree" program to show which files have changed between two trees. - Linus Torvalds
* 79517a067 - Sat, 9 Apr 2005 12:59:11 -0700  Export "cache_name_compare()" helper function. - Linus Torvalds
* 83adac3c5 - Sat, 9 Apr 2005 12:11:25 -0700  Make "read-tree" read the tree into the current directory cache. - Linus Torvalds
* 197ee8c97 - Sat, 9 Apr 2005 12:09:27 -0700  Make "write_cache()" and friends available as generic routines. - Linus Torvalds
* 8d3af1d53 - Sat, 9 Apr 2005 11:24:41 -0700  Fix "checkout-cache.c" mis-use of read_sha1_file() interface. - Linus Torvalds
* f7391ce3b - Sat, 9 Apr 2005 09:59:44 -0700  Fix up "checkout-cache" a bit - Linus Torvalds
* 33db5f4d9 - Sat, 9 Apr 2005 09:53:05 -0700  Add a "checkout-cache" command which does what the name suggests. - Linus Torvalds
* 734aab758 - Sat, 9 Apr 2005 09:48:20 -0700  Make the cache stat information comparator public. - Linus Torvalds
* eb38c22f5 - Sat, 9 Apr 2005 09:26:55 -0700  Make "cache_name_pos()" available to others. - Linus Torvalds
* 59c1e2498 - Sat, 9 Apr 2005 00:25:22 -0700  Fix missing return values and some error tests for empty index files - Linus Torvalds
* 1ea34e365 - Fri, 8 Apr 2005 17:11:14 -0700  Make fsck-cache start parsing the object types, and checking their internal format. - Linus Torvalds
* 942616776 - Fri, 8 Apr 2005 15:31:19 -0700  Add "-lz" to link line to get in zlib. - Linus Torvalds
* 7660a188d - Fri, 8 Apr 2005 15:04:51 -0700  Add new fsck-cache to Makefile. - Linus Torvalds
* 20222118a - Fri, 8 Apr 2005 15:02:42 -0700  Add first cut at "fsck-cache" that validates the SHA1 object store. - Linus Torvalds
* 2ade93402 - Fri, 8 Apr 2005 15:01:15 -0700  Add "check_sha1_signature()" helper function - Linus Torvalds
* 24778e335 - Fri, 8 Apr 2005 14:42:29 -0700  Factor out "read_sha1_file" into mapping/inflating/unmapping. - Linus Torvalds
* 19b2860cb - Fri, 8 Apr 2005 09:59:28 -0700  Use "-Wall -O2" for the compiler to get more warnings. - Linus Torvalds
* bf0c6e839 - Fri, 8 Apr 2005 09:16:38 -0700  Make "cat-file" output the file contents to stdout. - Linus Torvalds
* e497ea2a9 - Thu, 7 Apr 2005 21:03:28 -0700  Make read-tree actually unpack the whole tree. - Linus Torvalds
* 8bc9a0c76 - Thu, 7 Apr 2005 15:16:10 -0700  Add copyright notices. - Linus Torvalds
* e83c51633 - Thu, 7 Apr 2005 15:13:13 -0700  (HEAD) Initial revision of "git", the information manager from hell - Linus Torvalds