summaryrefslogtreecommitdiffstats
path: root/git-resolve-script (unfollow)
Commit message (Expand)AuthorFilesLines
2005-06-12git-apply: ignore empty git headersLinus Torvalds1-1/+1
2005-06-10[PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries.Junio C Hamano1-2/+6
2005-06-10git-read-tree: remove deleted files in the working directoryLinus Torvalds2-6/+20
2005-06-10[PATCH] Add git-diff-stages command.Junio C Hamano2-1/+114
2005-06-09git-read-tree: add "--reset" flagLinus Torvalds1-9/+38
2005-06-09One more time.. Clean up git-merge-one-file-scriptLinus Torvalds1-42/+15
2005-06-09Fix up git-merge-one-file-scriptLinus Torvalds1-7/+18
2005-06-09[PATCH] git-merge-one-file-script cleanups from CogitoPetr Baudis1-15/+29
2005-06-09Make sure we error out if we can't remove a file on automatic merges.Linus Torvalds1-1/+2
2005-06-09[PATCH] Tidy up some rev-list-related stuffPetr Baudis3-259/+227
2005-06-09[PATCH] Add read-tree -m 3-way merge tests.Junio C Hamano2-12/+366
2005-06-09[PATCH] Fix git-merge-one-file permissions auto-mergingPetr Baudis1-0/+4
2005-06-08Remove MERGE_HEAD after committing mergeLinus Torvalds1-1/+2
2005-06-08Make "git commit" work correctly in the presense of a manual mergeLinus Torvalds2-3/+15
2005-06-08cvs-migration: add more of a header to the "annotate" discussionLinus Torvalds1-3/+20
2005-06-08[PATCH] Miniscule correction of diff-format.txtChristian Meder1-6/+7
2005-06-08[PATCH] Anal retentive 'const unsigned char *sha1'Jason McMullan14-22/+22
2005-06-08[PATCH] git-diff-cache: handle pathspec beginning with a dashJonas Fonseca1-1/+6
2005-06-08Leave merge failures in the filesystemLinus Torvalds1-12/+19
2005-06-08Fix SIGSEGV on unmerged files in git-diff-files -pLinus Torvalds1-1/+1
2005-06-08[PATCH] Tests: read-tree -m test updates.Junio C Hamano2-32/+30
2005-06-08Make default merge messages denser.Linus Torvalds2-5/+2
2005-06-08[PATCH] three --merge-order bug fixesJon Seymour2-3/+177
2005-06-08[PATCH] git-cvs2git: create tagsSven Verdoolaege1-0/+7
2005-06-08git-apply: creatign empty files is nonfatalLinus Torvalds1-2/+5
2005-06-08Talk about "git cvsimport" in the cvs migration docsLinus Torvalds1-1/+89
2005-06-08[PATCH] Documentation: describe diff tweaking (fix).Junio C Hamano1-1/+1