tor' content='cgit v1.2.3'/>
aboutsummaryrefslogtreecommitdiffstats
path: root/merge-cache.c (unfollow)
AgeCommit message (Expand)AuthorFilesLines
2005-04-27[PATCH] Fix up <sys/socket.h> include dependencyAndreas Gal1-0/+1
2005-04-27diff.c: don't add extra '/' to pathnameLinus Torvalds1-2/+0
2005-04-27diff-cache: handle modified new files correctlyLinus Torvalds1-18/+44
2005-04-27[PATCH] Teach diff-tree-helper to handle unmerged paths.Junio C Hamano1-1/+1
2005-04-27[PATCH] Add -p (patch) to diff-cache.Junio C Hamano1-9/+28
2005-04-27[PATCH] Add -p (patch) to diff-tree.Junio C Hamano1-9/+26
2005-04-27[PATCH] Reactivate show-diff patch generationJunio C Hamano1-14/+42
2005-04-27[PATCH] Reworked external diff interface.Junio C Hamano2-40/+72
2005-04-26Allow writing to the private index file mapping.Linus Torvalds1-1/+1
2005-04-26diff-cache: fix handling of unmerged files.Linus Torvalds1-22/+39
2005-04-26diff-cache.c: use the "U <pathname>" format for unmerged entries.Linus Torvalds1-1/+1
2005-04-26[PATCH] diff-cache/tree compatible output for show-diff (take 2).Junio C Hamano1-9/+18
2005-04-26show-diff: don't print out the full "ce" format for unmerged filesLinus Torvalds1-1/+1
2005-04-26show-diff: match diff-tree and diff-cache outputLinus Torvalds1-31/+32
2005-04-26git-pull-script: do automatic mergesLinus Torvalds1-3/+11
2005-04-26[PATCH] introduce xmalloc and xreallocChristopher Li18-41/+54
2005-04-26update-cache: remove index lock file on SIGINTLinus Torvalds1-0/+7
2005-04-26[PATCH] diff-cache bugletJunio C Hamano1-1/+1
2005-04-26[PATCH] Diff-tree-helper take two.Junio C Hamano4-270/+271
2005-04-25[PATCH] Introduce diff-tree-helper.Junio C Hamano4-1/+363
2005-04-25[PATCH] Split external diff command interface to a separate file.Junio C Hamano4-98/+130
2005-04-25fsck-cache: show root objects only with "--root"Linus Torvalds1-1/+6
2005-04-25fsck-cache: only show tags if asked to do so with "--tags"Linus Torvalds1-5/+25
2005-04-25Add the git-*-script files to the installLinus Torvalds1-2/+3