Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 23b127ed08 [PATCH] Teach ls-tree about commit objects Junio C Hamano 2005-04-20 18:06:50 -07:00
• c1fdf2a6ab [PATCH] Teach diff-tree about commit objects Junio C Hamano 2005-04-20 18:06:50 -07:00
• 38357e6703 [PATCH] Teach diff-cache about commit objects Junio C Hamano 2005-04-20 18:06:49 -07:00
• f4913f91a9 [PATCH] Accept commit in some places when tree is needed. Junio C Hamano 2005-04-20 18:06:49 -07:00
• 6ca25ed331 [PATCH] simplify Makefile Andre Noll 2005-04-20 13:10:13 -07:00
• 2dee060968 Improve build: add <unistd.h> and use -O2 instead of -O3 Linus Torvalds 2005-04-20 13:00:08 -07:00
• ca9be05421 Make the sha1 of the index file go at the very end of the file. Linus Torvalds 2005-04-20 12:36:41 -07:00
• 4990aadc4c Speed up index file writing by chunking it nicely. Linus Torvalds 2005-04-20 12:16:57 -07:00
• 706bc531a1 Make "write_sha1_file()" exit early if the file already exists. Linus Torvalds 2005-04-20 09:28:05 -07:00
• ad4e9ce4f9 [PATCH] make dotest more amenable to commit message editing James Bottomley 2005-04-20 08:23:00 -07:00
• f18ca73166 The recent hash/compression switch-over missed the blob creation. Linus Torvalds 2005-04-20 01:34:54 -07:00
• d98b46f8d9 Do SHA1 hash _before_ compression. Linus Torvalds 2005-04-20 01:10:46 -07:00
• cb126d8d79 [PATCH] init-db.c: create and use safe_create_dir helper Zach Welch 2005-04-19 21:48:15 -07:00
• addb315d34 [PATCH] init-db.c: normalize env var handling. Zach Welch 2005-04-19 21:48:15 -07:00
• 4696cb93d1 [PATCH] init-db.c: cleanup comments Zach Welch 2005-04-19 21:48:15 -07:00
• abdb007d1f Make "diff-tree" take commit objects too, like "diff-cache" does. Linus Torvalds 2005-04-19 21:39:28 -07:00
• e74f8f6aa7 Add "diff-cache" helper program to compare a tree (or commit) with the current cache state and/or working directory. Linus Torvalds 2005-04-19 21:00:09 -07:00
• b96afa59eb Make us be better at guessing a good hostname for the email. Linus Torvalds 2005-04-19 15:46:06 -07:00
• 17cf781661 Remove duplicate getenv(DB_ENVIRONMENT) call Linus Torvalds 2005-04-19 14:11:06 -07:00
• c9823a427a Add stupid "git export" thing, which can export a git archive as a set of patches and commentary. Linus Torvalds 2005-04-19 14:00:34 -07:00
• 7fa6b4e769 Fix init-db shared database case Linus Torvalds 2005-04-19 13:59:17 -07:00
• 8ccfbf3279 Update "git-pull-script" to use "read-tree -m" for reading a single tree too. That should speed up a trivial merge noticeably. Linus Torvalds 2005-04-19 12:56:47 -07:00
• a3a65234db Make "read-tree" know how to do a "1-way merge". Linus Torvalds 2005-04-19 11:41:18 -07:00
• ca016f0e4e Make "read-tree" take the 'stat' information for a merge result from the old index state if the result matches. Linus Torvalds 2005-04-19 11:16:12 -07:00
• 4aaef1064a Make git-pull-script do the right thing for symlinked HEAD's. Linus Torvalds 2005-04-19 09:53:58 -07:00
• 3b7d368f34 Don't parse commit objects more than once. Linus Torvalds 2005-04-19 09:52:24 -07:00
• 0a9ea85000 [PATCH] SCSI trees, merges and git status James Bottomley 2005-04-18 19:55:19 -07:00
• 6109681994 Add quotes around the subject line that we print out as being applied. Linus Torvalds 2005-04-18 17:40:32 -07:00
• b70070f020 [PATCH] provide better committer information to commit-tree.c Greg KH 2005-04-18 17:37:32 -07:00
• f43b8abc6f Make fsck-cache print the object type for unreachable objects. Linus Torvalds 2005-04-18 17:35:31 -07:00
• 8c1becff24 [PATCH] show-diff: Remove stale comments Junio C Hamano 2005-04-18 16:51:09 -07:00
• 0ffb0bcaf6 [PATCH] Do not let rsync obliterate .git/object symbolic link. Junio C Hamano 2005-04-18 16:49:21 -07:00
• e90a4c0ed1 Add "dotest" and "applypatch" scripts to actually make things useful. Linus Torvalds 2005-04-18 16:11:32 -07:00
• 4789576e0e [PATCH] show-diff.c: -R option for reverse diff. Junio C Hamano 2005-04-18 15:07:24 -07:00
• ff69ab9ad8 [PATCH] show-diff.c: make diff options customizable. Junio C Hamano 2005-04-18 15:07:24 -07:00
• 5a6ad74623 [PATCH] show-diff.c: adjust default format for the Linux kernel. Junio C Hamano 2005-04-18 15:07:24 -07:00
• 8f3671dcd9 [PATCH] show-diff.c: simplify show_diff_empty. Junio C Hamano 2005-04-18 15:07:24 -07:00
• d0db466326 [PATCH] show-diff.c: check unreadbale blob. Junio C Hamano 2005-04-18 15:07:24 -07:00
• c157d37674 [PATCH] show-diff.c: clean up private buffer use. Junio C Hamano 2005-04-18 15:07:24 -07:00
• 00829b5def Add "update-cache --refresh" to git-pull-script to make sure out index is all ready to go after a pull. Linus Torvalds 2005-04-18 15:01:48 -07:00
• e3b4be7f6c Change merge-cache and git-merge-one-file to use the SHA1 of the file instead of a checked-out temporary copy. Linus Torvalds 2005-04-18 14:17:58 -07:00
• 3407bb4940 Add "unpack-file" helper that unpacks a sha1 blob into a tmpfile. Linus Torvalds 2005-04-18 14:11:01 -07:00
• e590d694ea Add more header dependencies. Linus Torvalds 2005-04-18 13:12:21 -07:00
• 0fcfd160b0 Split up read-cache.c into more logical clumps. Linus Torvalds 2005-04-18 13:04:43 -07:00
• 0a02ce72d9 Clean up the Makefile a bit. Linus Torvalds 2005-04-18 12:49:39 -07:00
• 839a7a06f3 Add the simple scripts I used to do a merge with content conflicts. Linus Torvalds 2005-04-18 12:15:10 -07:00
• b51ad43140 Merge the new object model thing from Daniel Barkalow Linus Torvalds 2005-04-18 12:12:00 -07:00
• a4b7dbef4e [PATCH] fix bug in read-cache.c which loses files when merging a tree James Bottomley 2005-04-18 11:44:31 -07:00
• b5039db6d2 [PATCH] Switch implementations of merge-base, port to parsing Daniel Barkalow 2005-04-18 11:39:48 -07:00
• ff5ebe39b0 [PATCH] Port fsck-cache to use parsing functions Daniel Barkalow 2005-04-18 11:39:48 -07:00
• 5873b67eef [PATCH] Port rev-tree to parsing functions Daniel Barkalow 2005-04-18 11:39:48 -07:00
• 175785e5ff [PATCH] Implementations of parsing functions Daniel Barkalow 2005-04-18 11:39:48 -07:00
• 6eb8ae00d4 [PATCH] Header files for object parsing Daniel Barkalow 2005-04-18 11:39:48 -07:00
• 1bc992acac [PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths. Junio C Hamano 2005-04-18 10:42:48 -07:00
• 6ad6d3d36c Update README to reflect the hierarchical tree objects, and other newfangled things like merging. Linus Torvalds 2005-04-17 21:52:23 -07:00
• 64982f7510 [PATCH] (resend) show-diff.c off-by-one fix Junio C Hamano 2005-04-17 20:31:40 -07:00
• 75118b13bc Ass a "merge-cache" helper program to execute a merge on any unmerged files. Linus Torvalds 2005-04-17 19:52:54 -07:00
• 74b2428f55 [PATCH] fork optional branch point normazilation Brad Roberts 2005-04-17 19:12:14 -07:00
• d9f98eebcd Ignore any unmerged entries for "checkout-cache -a". Linus Torvalds 2005-04-17 18:39:14 -07:00
• 5e5128ed1c Remove extraneous ',' ';' and '.' characters from the full name gecos field. Linus Torvalds 2005-04-17 16:52:54 -07:00
• 08ca0b04ba Make the revision tracking track the object types too. Linus Torvalds 2005-04-17 16:19:32 -07:00
• d0d7cbe730 Make "commit-tree" check the input objects more carefully. Linus Torvalds 2005-04-17 15:26:13 -07:00
• 7d60ad7cc9 Make "parse_commit" return the "struct revision" for the commit. Linus Torvalds 2005-04-17 12:40:18 -07:00
• 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 -07:00
• 15000d7899 Make "rev-tree.c" use the new-and-improved "mark_reachable()" Linus Torvalds 2005-04-17 12:09:20 -07:00
• 01796b0e91 Make "revision.h" slightly better to use. Linus Torvalds 2005-04-17 12:07:00 -07:00
• 89d21f4b64 Move "parse_commit()" into common revision.h file. Linus Torvalds 2005-04-17 11:39:18 -07:00
• 7223a88ce7 [PATCH] fix for memory leak in write-tree.c Brad Roberts 2005-04-17 10:55:12 -07:00
• e8871e88ad [PATCH] Fix +x-related show-diff false positives Petr Baudis 2005-04-17 10:04:48 -07:00
• c747fc6fac [PATCH] Remove unused arguments from index_fd() Junio C Hamano 2005-04-17 10:02:22 -07:00
• a38800fde2 [PATCH] Better error message from checkout-cache for unmerged files. Junio C Hamano 2005-04-17 10:02:21 -07:00
• fa06d442c6 Fix total permission bogosity in "checkout-cache.c". Linus Torvalds 2005-04-17 09:55:36 -07:00
• c4e3cca1f7 [PATCH] update-cache --remove marks the path merged. Junio C Hamano 2005-04-17 09:53:35 -07:00
• 8f41523fc1 [PATCH] show-diff.c: do not include unused header file Junio C Hamano 2005-04-17 09:53:35 -07:00
• e44794706e Be much more liberal about the file mode bits. Linus Torvalds 2005-04-16 22:26:31 -07:00
• 9fec8b26ef [PATCH] Do not run useless show-diff on unmerged paths repeatedly. Junio C Hamano 2005-04-16 21:29:45 -07:00
• d2522a6528 [PATCH] show-diff style fix. Junio C Hamano 2005-04-16 21:29:45 -07:00
• b70c8942d3 [PATCH] Rename confusing variable in show-diff Junio C Hamano 2005-04-16 21:29:45 -07:00
• 9bd94cafdf [PATCH] show-diff shell safety Junio C Hamano 2005-04-16 21:29:45 -07:00
• d94c6128e6 [PATCH] show-diff -z option for machine readable output. Junio C Hamano 2005-04-16 21:29:45 -07:00
• b8f80925e3 [PATCH] Optionally tell show-diff to show only named files Junio C Hamano 2005-04-16 21:29:45 -07:00
• 0f2303f719 [PATCH] Un unoptimize ls-tree behaviour Junio C Hamano 2005-04-16 13:57:39 -07:00
• eec8c633c1 Add "--unmerged" flag to "show-files", which does what the name implies. Linus Torvalds 2005-04-16 12:43:32 -07:00
• 2fbdd13174 Remove "merge-tree.c" Linus Torvalds 2005-04-16 12:24:12 -07:00
• 7b937ca331 When inserting a index entry of stage 0, remove all old unmerged entries. Linus Torvalds 2005-04-16 12:05:45 -07:00
• 43f91266a4 Make 'read-tree' do a few more of the trivial merge cases. Linus Torvalds 2005-04-16 09:11:49 -07:00
• aee461985f [PATCH] Add --stage to show-files for new stage dircache. Junio C Hamano 2005-04-16 08:33:23 -07:00
• fcf712e60e [PATCH] Byteorder fix for read-tree, new -m semantics version. Junio C Hamano 2005-04-16 08:30:20 -07:00
• d99082e0e3 Make "read-tree" merge the trees it reads by giving them consecutive states. Linus Torvalds 2005-04-15 22:53:45 -07:00
• 95fd5bf82a Make cache entry comparison take the new "state" flag into account. Linus Torvalds 2005-04-15 22:51:44 -07:00
• c347ea5d6f write-tree: refuse to write out trees with unmerged index entries. Linus Torvalds 2005-04-15 22:04:54 -07:00
• f5cabd13d8 Encode a few extra flags per index entry. Linus Torvalds 2005-04-15 21:45:38 -07:00
• 13e897e580 Simplify show-diff cache entry name handling. Linus Torvalds 2005-04-15 21:42:34 -07:00
• d07f651c25 [PATCH] Add '-z' to merge-tree.c Junio C Hamano 2005-04-15 19:20:42 -07:00
• 6cbd72f8d5 Make "diff-tree" have similar behaviour as "ls-tree" wrt line termination. Linus Torvalds 2005-04-15 15:11:57 -07:00
• ca2a079865 [PATCH] Add "-q" option to show-diff.c Junio C Hamano 2005-04-15 15:08:09 -07:00
• b83c83457e [PATCH] Add -z option to show-files Junio C Hamano 2005-04-15 11:11:01 -07:00
• 9945d98051 Add "--cacheinfo" option to update-cache. Linus Torvalds 2005-04-15 11:08:33 -07:00
• ccc4feb579 Convert the index file reading/writing to use network byte order. Linus Torvalds 2005-04-15 10:44:27 -07:00
• 27de946d0e [PATCH] Simplify date handling and make it more reliable David Woodhouse 2005-04-15 08:39:57 -07:00