summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-04-04Merge branch 'post1.5.1/p4'Libravatar Junio C Hamano2-7/+53
2007-04-04Merge branch 'lt/dirwalk'Libravatar Junio C Hamano5-9/+95
2007-04-03GIT 1.5.1Libravatar Junio C Hamano3-16/+187
2007-04-03Merge 1.5.0.7 inLibravatar Junio C Hamano3-4/+44
2007-04-03GIT 1.5.0.7Libravatar Junio C Hamano3-2/+20
2007-04-03Documentation: A few minor fixes to Git User's ManualLibravatar Jakub Narebski1-10/+10
2007-04-03Plug memory leak in index-pack collision checking codepath.Libravatar Nicolas Pitre1-0/+1
2007-04-03rerere should not repeat the earlier hunks in later onesLibravatar Junio C Hamano2-4/+26
2007-04-02Hopefully final update to the draft Release Notes, preparing for 1.5.1Libravatar Junio C Hamano1-8/+15
2007-03-31Added correct Python path to the RPM specfile.Libravatar Eygene Ryabinkin1-1/+5
2007-03-31Remove unused WITH_OWN_SUBPROCESS_PY from RPM specLibravatar Brian Gernhardt1-5/+4
2007-03-31Added git-p4 package to the list of git RPMs.Libravatar Eygene Ryabinkin1-4/+21
2007-03-31Add the WITH_P4IMPORT knob to the Makefile.Libravatar Eygene Ryabinkin1-0/+26
2007-03-31Optimize directory listing with pathspec limiter.Libravatar Linus Torvalds5-9/+95
2007-03-31cvsserver: Don't lie about binary mode in asciidoc documentationLibravatar Frank Lichtenheld1-3/+5
2007-03-31git-svn: fail on rebase if we are unable to find a ref to rebase againstLibravatar Eric Wong1-0/+3
2007-03-31Keep rename/rename conflicts of intermediate merges while doing recursive mergeLibravatar Alex Riesen1-6/+31
2007-03-31contrib/workdir: add a simple script to create a working directoryLibravatar Julian Phillips1-0/+57
2007-03-31Reimplement emailing part of hooks--update in contrib/hooks/post-receive-emailLibravatar Andy Parkins2-0/+605
2007-03-31git-svn: avoid respewing similar error messages for missing pathsLibravatar Eric Wong1-5/+11
2007-03-31Rename warn() to warning() to fix symbol conflicts on BSD and Mac OSLibravatar Theodore Ts'o5-6/+6
2007-03-31git-mailinfo fixes for patch mungingLibravatar Don Zickus2-12/+13
2007-03-31gitweb: Support comparing blobs (files) with different namesLibravatar Jakub Narebski1-2/+2
2007-03-30Do not bother documenting fetch--toolLibravatar Junio C Hamano1-1/+1
2007-03-30Update draft release notes for 1.5.1Libravatar Junio C Hamano1-1/+6
2007-03-29Merge branch 'maint'Libravatar Junio C Hamano2-9/+9
2007-03-29git-quiltimport /bin/sh-ism fixLibravatar Francis Daly1-1/+1
2007-03-29Bisect: Improve error message in "bisect_next_check".Libravatar Christian Couder1-7/+9
2007-03-29Merge branch 'master' of git://repo.or.cz/git/mergetool.gitLibravatar Junio C Hamano2-81/+87
2007-03-29mergetool: Clean up description of files and prompts for merge resolutionsLibravatar Theodore Ts'o1-12/+15
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictLibravatar Theodore Ts'o1-1/+1
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandLibravatar Theodore Ts'o1-2/+14
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesLibravatar Theodore Ts'o1-4/+4
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setLibravatar Theodore Ts'o1-1/+1
2007-03-29mergetool: factor out common codeLibravatar Theodore Ts'o1-42/+36
2007-03-29mergetool: portability fix: don't use reserved word functionLibravatar Theodore Ts'o1-5/+5
2007-03-29mergetool: portability fix: don't assume true is in /binLibravatar Theodore Ts'o1-2/+2
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedLibravatar Theodore Ts'o1-6/+5
2007-03-29mergetool: Replace use of "echo -n" with printf(1) to be more portableLibravatar Theodore Ts'o1-14/+12
2007-03-29Fix minor formatting issue in man page for git-mergetoolLibravatar Theodore Ts'o1-5/+5
2007-03-29git-upload-pack: make sure we close unused pipe endsLibravatar H. Peter Anvin1-0/+1
2007-03-29Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.Libravatar Gerrit Pape1-8/+8
2007-03-29Documentation/git-svnimport.txt: fix typo.Libravatar Gerrit Pape1-1/+1
2007-03-28GIT 1.5.1-rc3Libravatar Junio C Hamano1-1/+1
2007-03-28Update main git.html page to point at 1.5.0.6 documentationLibravatar Junio C Hamano1-1/+3
2007-03-28Merge branch 'maint' to synchronize with 1.5.0.6Libravatar Junio C Hamano3-3/+28
2007-03-28GIT 1.5.0.6Libravatar Junio C Hamano3-2/+24
2007-03-28commit: fix pretty-printing of messages with "\nencoding "Libravatar Jeff King1-2/+5
2007-03-28t4118: be nice to non-GNU sedLibravatar Johannes Schindelin1-1/+2
2007-03-28t/t6006: add tests for a slightly more complex commit messagesLibravatar Jeff King1-0/+42