summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2005-06-12[PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -pLibravatar Junio C Hamano2-1/+2
2005-06-12git-apply: ignore empty git headersLibravatar Linus Torvalds1-1/+1
2005-06-10[PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries.Libravatar Junio C Hamano1-2/+6
2005-06-09git-read-tree: remove deleted files in the working directoryLibravatar Linus Torvalds2-6/+20
2005-06-09[PATCH] Add git-diff-stages command.Libravatar Junio C Hamano2-1/+114
2005-06-09git-read-tree: add "--reset" flagLibravatar Linus Torvalds1-9/+38
2005-06-08One more time.. Clean up git-merge-one-file-scriptLibravatar Linus Torvalds1-42/+15
2005-06-08Fix up git-merge-one-file-scriptLibravatar Linus Torvalds1-7/+18
2005-06-08Merge my and Petr's git-merge-one-file-script modificationsLibravatar Linus Torvalds1-1/+2
2005-06-08[PATCH] git-merge-one-file-script cleanups from CogitoLibravatar Petr Baudis1-15/+29
2005-06-08Make sure we error out if we can't remove a file on automatic merges.Libravatar Linus Torvalds1-1/+2
2005-06-08[PATCH] Tidy up some rev-list-related stuffLibravatar Petr Baudis3-259/+227
2005-06-08[PATCH] Add read-tree -m 3-way merge tests.Libravatar Junio C Hamano2-12/+366
2005-06-08[PATCH] Fix git-merge-one-file permissions auto-mergingLibravatar Petr Baudis1-0/+4
2005-06-08Remove MERGE_HEAD after committing mergeLibravatar Linus Torvalds1-1/+2
2005-06-08Make "git commit" work correctly in the presense of a manual mergeLibravatar Linus Torvalds2-3/+15
2005-06-08cvs-migration: add more of a header to the "annotate" discussionLibravatar Linus Torvalds1-3/+20
2005-06-08[PATCH] Miniscule correction of diff-format.txtLibravatar Christian Meder1-6/+7
2005-06-08[PATCH] Anal retentive 'const unsigned char *sha1'Libravatar Jason McMullan14-22/+22
2005-06-08[PATCH] git-diff-cache: handle pathspec beginning with a dashLibravatar Jonas Fonseca1-1/+6
2005-06-08Leave merge failures in the filesystemLibravatar Linus Torvalds1-12/+19
2005-06-08Fix SIGSEGV on unmerged files in git-diff-files -pLibravatar Linus Torvalds1-1/+1
2005-06-08[PATCH] Tests: read-tree -m test updates.Libravatar Junio C Hamano2-32/+30
2005-06-08Make default merge messages denser.Libravatar Linus Torvalds2-5/+2
2005-06-08[PATCH] three --merge-order bug fixesLibravatar Jon Seymour2-3/+177
2005-06-08[PATCH] git-cvs2git: create tagsLibravatar Sven Verdoolaege1-0/+7
2005-06-08git-apply: creatign empty files is nonfatalLibravatar Linus Torvalds1-2/+5
2005-06-07Talk about "git cvsimport" in the cvs migration docsLibravatar Linus Torvalds1-1/+89
2005-06-07[PATCH] Documentation: describe diff tweaking (fix).Libravatar Junio C Hamano1-1/+1
2005-06-07[PATCH] Start cvs-migration documentationLibravatar Junio C Hamano1-0/+105
2005-06-07git-read-tree: -u without -m is meaningless. Don't allow it.Libravatar Linus Torvalds1-1/+3
2005-06-07git-read-tree: make one-way merge also honor the "update" flagLibravatar Linus Torvalds1-5/+5
2005-06-07[PATCH] read-tree: update documentation for 3-way merge.Libravatar Junio C Hamano1-24/+66
2005-06-07Add CVS import scripts and programsLibravatar Linus Torvalds3-2/+336
2005-06-07git-ssh-push/pull: usability improvementsLibravatar Linus Torvalds4-8/+13
2005-06-07[PATCH] Use ntohs instead of htons to convert ce_flags to host byte orderLibravatar Timo Hirvonen1-5/+5
2005-06-07[PATCH] read-tree: save more user hassles during fast-forward.Libravatar Junio C Hamano4-13/+698
2005-06-06[PATCH] Document git-ssh-pull and git-ssh-pushLibravatar Daniel Barkalow2-11/+45
2005-06-06git-resolve-script: stop when the automated merge failsLibravatar Linus Torvalds1-1/+5
2005-06-06Make fetch/pull scripts terminate cleanly on errorsLibravatar Linus Torvalds2-3/+3
2005-06-06git-resolve-script: don't wait for three seconds any moreLibravatar Linus Torvalds1-3/+0
2005-06-06[PATCH] -w support for git-ssh-pull/pushLibravatar Daniel Barkalow2-5/+41
2005-06-06[PATCH] Generic support for pulling refsLibravatar Daniel Barkalow5-9/+63
2005-06-06[PATCH] rsh.c environment variableLibravatar Daniel Barkalow1-2/+2
2005-06-06[PATCH] Operations on refsLibravatar Daniel Barkalow5-2/+207
2005-06-06git-read-tree: some "final" cleanupsLibravatar Linus Torvalds1-14/+10
2005-06-06git-read-tree: simplify merge loops enormouslyLibravatar Linus Torvalds1-163/+110
2005-06-06[PATCH] index locking like everybody elseLibravatar Junio C Hamano1-17/+5
2005-06-06Add "__noreturn__" attribute to die() and usage()Libravatar Linus Torvalds1-2/+8
2005-06-06git-rev-list: make sure to link with ssl librariesLibravatar Linus Torvalds1-0/+1