GIT 0.99.7c

Contains the following post-0.99.7b fixes:

 - rsh.c string termination fix by H. Peter Anvin
 - further fetch fixes by Sergey Vlasov
 - diff-tree documentation by Robert Watson.
 - 'git diff --cached' synonymous to 'git diff --cached HEAD'.
 - subprocess.py licensing status clarification.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. 2ba6c47 read-tree: fix bogus debugging statement. by Junio C Hamano · 20 years ago
  2. 720d150 Add a new merge strategy by Fredrik Kuivinen. by Junio C Hamano · 20 years ago
  3. bb97a2a Plug leak in Daniel's read-tree. by Junio C Hamano · 20 years ago
  4. 4d3fe0c [PATCH] Add debugging help for case #16 to read-tree.c by Junio C Hamano · 20 years ago
  5. 2ab706a [PATCH] Disable debugging from read-tree. by Junio C Hamano · 20 years ago
  6. ee6566e [PATCH] Rewrite read-tree by Daniel Barkalow · 20 years ago
  7. 4d1f119 [PATCH] Unify usage strings declaration by Petr Baudis · 20 years ago
  8. 0ca14a5 Start adding interfaces to read in partial trees by Linus Torvalds · 20 years ago
  9. 7875b50 git-read-tree: fix "--reset" handling by Linus Torvalds · 20 years ago
  10. 036d51c [PATCH] read-tree: loosen too strict index requirements by Junio C Hamano · 20 years ago
  11. 32192e6 [PATCH] Finish making --emu23 equivalent to pure 2-way merge. by Junio C Hamano · 20 years ago
  12. e7f9bc4 [PATCH] read-tree: fix too strong index requirement #5ALT by Junio C Hamano · 20 years ago
  13. 03efa6d [PATCH] read-tree --emu23. by Junio C Hamano · 20 years ago
  14. aa16021 git-read-tree: remove deleted files in the working directory by Linus Torvalds · 20 years ago
  15. 438195c git-read-tree: add "--reset" flag by Linus Torvalds · 20 years ago
  16. a57f0b5 git-read-tree: -u without -m is meaningless. Don't allow it. by Linus Torvalds · 20 years ago
  17. b5b4250 git-read-tree: make one-way merge also honor the "update" flag by Linus Torvalds · 20 years ago
  18. c859600 [PATCH] read-tree: save more user hassles during fast-forward. by Junio C Hamano · 20 years ago
  19. 4513225 git-read-tree: some "final" cleanups by Linus Torvalds · 20 years ago
  20. d723c69 git-read-tree: simplify merge loops enormously by Linus Torvalds · 20 years ago
  21. 96cd542 [PATCH] index locking like everybody else by Junio C Hamano · 20 years ago
  22. d925ffb Fix off-by-one in new three-way-merge updates by Linus Torvalds · 20 years ago
  23. a76d74f Three-way merge: fix silly bug that made trivial merges not work by Linus Torvalds · 20 years ago
  24. e6ee623 git-read-tree: fix up two-way merge by Linus Torvalds · 20 years ago
  25. 220a0b5 More work on merging with git-read-tree.. by Linus Torvalds · 20 years ago
  26. 76f3834 git-read-tree: fix up three-way merge tests by Linus Torvalds · 20 years ago
  27. 02ede67 git-read-tree: be a lot more careful about merging dirty trees by Linus Torvalds · 20 years ago
  28. e99d59f sparse cleanup by Linus Torvalds · 20 years ago
  29. 667bb59 [PATCH] cleanup of in-code names by Alexey Nezhdanov · 20 years ago
  30. 1424246 Fixed a leak in read-tree by Petr Baudis · 20 years ago
  31. 3c249c9 Add "get_sha1()" helper function. by Linus Torvalds · 20 years ago
  32. 40469ee [PATCH] Rename and extend read_tree_with_tree_or_commit_sha1 by Junio C Hamano · 20 years ago
  33. 94537c7 Move "read_tree()" to "tree.c" to be used as a generic helper function. by Linus Torvalds · 20 years ago
  34. aba06682 Clean up and simplify read-tree a bit. by Linus Torvalds · 20 years ago
  35. bb233d6 Add support for a "GIT_INDEX_FILE" environment variable. by Linus Torvalds · 20 years ago
  36. c5bac17 [PATCH] Usage-string fixes. by Junio C Hamano · 20 years ago
  37. b12ec37 [PATCH] Teach read-tree about commit objects by Junio C Hamano · 20 years ago
  38. a3a6523 Make "read-tree" know how to do a "1-way merge". by Linus Torvalds · 20 years ago
  39. ca016f0 Make "read-tree" take the 'stat' information for a merge result from the by Linus Torvalds · 20 years ago
  40. e447947 Be much more liberal about the file mode bits. by Linus Torvalds · 20 years ago
  41. 43f9126 Make 'read-tree' do a few more of the trivial merge cases. by Linus Torvalds · 20 years ago
  42. d99082e Make "read-tree" merge the trees it reads by giving them consecutive states. by Linus Torvalds · 20 years ago
  43. f5cabd1 Encode a few extra flags per index entry. by Linus Torvalds · 20 years ago
  44. ccc4feb Convert the index file reading/writing to use network byte order. by Linus Torvalds · 20 years ago
  45. 2de381f [PATCH] Consolidate the error handling by Petr Baudis · 20 years ago
  46. 4bb04f2 Rename ".dircache" directory to ".git" by Linus Torvalds · 20 years ago
  47. 9614b8d Fix stale index.lock file removal using "atexit()". by Linus Torvalds · 20 years ago
  48. 121481a Make "update-cache" a bit friendlier to use (and harder to mis-use). by Linus Torvalds · 20 years ago
  49. f768846 Teach "fsck" and "read-tree" about recursive tree-nodes. by Linus Torvalds · 20 years ago
  50. 83adac3 Make "read-tree" read the tree into the current directory cache. by Linus Torvalds · 20 years ago
  51. 19b2860 Use "-Wall -O2" for the compiler to get more warnings. by Linus Torvalds · 20 years ago
  52. e497ea2 Make read-tree actually unpack the whole tree. by Linus Torvalds · 20 years ago
  53. 8bc9a0c Add copyright notices. by Linus Torvalds · 20 years ago
  54. e83c516 Initial revision of "git", the information manager from hell by Linus Torvalds · 20 years ago