summaryrefslogtreecommitdiffstats
path: root/builtin-fmt-merge-msg.c (unfollow)
Commit message (Expand)AuthorFilesLines
2007-04-04GIT 1.5.1v1.5.1Junio C Hamano3-16/+187
2007-04-04GIT 1.5.0.7v1.5.0.7Junio C Hamano3-2/+20
2007-04-04Documentation: A few minor fixes to Git User's ManualJakub Narebski1-10/+10
2007-04-04Plug memory leak in index-pack collision checking codepath.Nicolas Pitre1-0/+1
2007-04-04rerere should not repeat the earlier hunks in later onesJunio C Hamano2-4/+26
2007-04-02Hopefully final update to the draft Release Notes, preparing for 1.5.1Junio C Hamano1-8/+15
2007-04-01cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld1-3/+5
2007-04-01git-svn: fail on rebase if we are unable to find a ref to rebase againstEric Wong1-0/+3
2007-03-31Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen1-6/+31