summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-04-03GIT 1.5.1v1.5.1Junio C Hamano3-16/+187
2007-04-03Merge 1.5.0.7 inJunio C Hamano3-4/+44
2007-04-03GIT 1.5.0.7v1.5.0.7Junio C Hamano3-2/+20
2007-04-03Documentation: A few minor fixes to Git User's ManualJakub Narebski1-10/+10
2007-04-03Plug memory leak in index-pack collision checking codepath.Nicolas Pitre1-0/+1
2007-04-03rerere 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-03-31cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld1-3/+5
2007-03-31git-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
2007-03-31contrib/workdir: add a simple script to create a working directoryJulian Phillips1-0/+57
2007-03-31Reimplement emailing part of hooks--update in contrib/hooks/post-receive-emailAndy Parkins2-0/+605
2007-03-31git-svn: avoid respewing similar error messages for missing pathsEric Wong1-5/+11
2007-03-31Rename warn() to warning() to fix symbol conflicts on BSD and Mac OSTheodore Ts'o5-6/+6
2007-03-31git-mailinfo fixes for patch mungingDon Zickus2-12/+13
2007-03-31gitweb: Support comparing blobs (files) with different namesJakub Narebski1-2/+2
2007-03-30Do not bother documenting fetch--toolJunio C Hamano1-1/+1
2007-03-30Update draft release notes for 1.5.1Junio C Hamano1-1/+6
2007-03-29Merge branch 'maint'Junio C Hamano2-9/+9
2007-03-29git-quiltimport /bin/sh-ism fixFrancis Daly1-1/+1
2007-03-29Bisect: Improve error message in "bisect_next_check".Christian Couder1-7/+9
2007-03-29Merge branch 'master' of git://repo.or.cz/git/mergetool.gitJunio C Hamano2-81/+87
2007-03-29mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o1-12/+15
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o1-1/+1
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o1-2/+14
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o1-4/+4
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o1-1/+1
2007-03-29mergetool: factor out common codeTheodore Ts'o1-42/+36
2007-03-29mergetool: portability fix: don't use reserved word functionTheodore Ts'o1-5/+5
2007-03-29mergetool: portability fix: don't assume true is in /binTheodore Ts'o1-2/+2
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o1-6/+5
2007-03-29mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o1-14/+12
2007-03-29Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o1-5/+5
2007-03-29git-upload-pack: make sure we close unused pipe endsH. Peter Anvin1-0/+1
2007-03-29Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.Gerrit Pape1-8/+8
2007-03-29Documentation/git-svnimport.txt: fix typo.Gerrit Pape1-1/+1
2007-03-28GIT 1.5.1-rc3v1.5.1-rc3Junio C Hamano1-1/+1
2007-03-28Update main git.html page to point at 1.5.0.6 documentationJunio C Hamano1-1/+3
2007-03-28Merge branch 'maint' to synchronize with 1.5.0.6Junio C Hamano3-3/+28
2007-03-28GIT 1.5.0.6v1.5.0.6Junio C Hamano3-2/+24
2007-03-28commit: fix pretty-printing of messages with "\nencoding "Jeff King1-2/+5
2007-03-28t4118: be nice to non-GNU sedJohannes Schindelin1-1/+2
2007-03-28t/t6006: add tests for a slightly more complex commit messagesJeff King1-0/+42
2007-03-28Fix "--pretty=format:" encoding itemJeff King1-1/+2
2007-03-28Fix "--pretty=format:" for parent related items.Junio C Hamano2-8/+12
2007-03-28http-fetch: remove path_len from struct alt_base, it was computed but never usedGerrit Pape1-17/+3
2007-03-28http-fetch: don't use double-slash as directory separator in URLsGerrit Pape3-11/+14
2007-03-28git-commit: "read-tree -m HEAD" is not the right way to read-tree quicklyJunio C Hamano1-1/+1
2007-03-27Add some basic tests of rev-list --pretty=formatJeff King1-0/+108
2007-03-27git-upload-pack: make sure we close unused pipe endsH. Peter Anvin1-0/+1