summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'post1.5.1/tcltk'Junio C Hamano2007-04-044-5/+78
|\
| * Optional Tck/Tk: ignore generated files.Junio C Hamano2007-04-011-0/+2
| * Eliminate checks of user-specified Tcl/Tk interpreter.Eygene Ryabinkin2007-04-011-3/+1
| * Rewrite Tcl/Tk interpreter path for the GUI tools.Eygene Ryabinkin2007-04-011-3/+24
| * Add --with-tcltk and --without-tcltk to configure.Eygene Ryabinkin2007-04-013-1/+38
| * NO_TCLTKEygene Ryabinkin2007-04-011-3/+18
* | Merge branch 'post1.5.1/p4'Junio C Hamano2007-04-042-7/+53
|\ \
| * | Added correct Python path to the RPM specfile.Eygene Ryabinkin2007-04-011-1/+5
| * | Remove unused WITH_OWN_SUBPROCESS_PY from RPM specBrian Gernhardt2007-04-011-5/+4
| * | Added git-p4 package to the list of git RPMs.Eygene Ryabinkin2007-04-011-4/+21
| * | Add the WITH_P4IMPORT knob to the Makefile.Eygene Ryabinkin2007-04-011-0/+26
| |/
* | Merge branch 'lt/dirwalk'Junio C Hamano2007-04-045-9/+95
|\ \
| * | Optimize directory listing with pathspec limiter.Linus Torvalds2007-04-015-9/+95
| |/
* | GIT 1.5.1v1.5.1Junio C Hamano2007-04-043-16/+187
* | Merge 1.5.0.7 inJunio C Hamano2007-04-043-4/+44
|\ \
| * | GIT 1.5.0.7v1.5.0.7Junio C Hamano2007-04-043-2/+20
| * | rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-042-4/+26
* | | Documentation: A few minor fixes to Git User's ManualJakub Narebski2007-04-041-10/+10
* | | Plug memory leak in index-pack collision checking codepath.Nicolas Pitre2007-04-041-0/+1
* | | Hopefully final update to the draft Release Notes, preparing for 1.5.1Junio C Hamano2007-04-021-8/+15
| |/ |/|
* | cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld2007-04-011-3/+5
* | git-svn: fail on rebase if we are unable to find a ref to rebase againstEric Wong2007-04-011-0/+3
* | Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen2007-03-311-6/+31
* | contrib/workdir: add a simple script to create a working directoryJulian Phillips2007-03-311-0/+57
* | Reimplement emailing part of hooks--update in contrib/hooks/post-receive-emailAndy Parkins2007-03-312-0/+605
* | git-svn: avoid respewing similar error messages for missing pathsEric Wong2007-03-311-5/+11
* | Rename warn() to warning() to fix symbol conflicts on BSD and Mac OSTheodore Ts'o2007-03-315-6/+6
* | git-mailinfo fixes for patch mungingDon Zickus2007-03-312-12/+13
* | gitweb: Support comparing blobs (files) with different namesJakub Narebski2007-03-311-2/+2
* | Do not bother documenting fetch--toolJunio C Hamano2007-03-301-1/+1
* | Update draft release notes for 1.5.1Junio C Hamano2007-03-301-1/+6
* | Merge branch 'maint'Junio C Hamano2007-03-302-9/+9
|\|
| * git-upload-pack: make sure we close unused pipe endsH. Peter Anvin2007-03-291-0/+1
| * Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.Gerrit Pape2007-03-291-8/+8
| * Documentation/git-svnimport.txt: fix typo.Gerrit Pape2007-03-291-1/+1
* | git-quiltimport /bin/sh-ism fixFrancis Daly2007-03-301-1/+1
* | Bisect: Improve error message in "bisect_next_check".Christian Couder2007-03-301-7/+9
* | Merge branch 'master' of git://repo.or.cz/git/mergetool.gitJunio C Hamano2007-03-302-81/+87
|\ \
| * | mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o2007-03-301-12/+15
| * | mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o2007-03-291-1/+1
| * | mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o2007-03-291-2/+14
| * | mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o2007-03-291-4/+4
| * | mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o2007-03-291-1/+1
| * | mergetool: factor out common codeTheodore Ts'o2007-03-291-42/+36
| * | mergetool: portability fix: don't use reserved word functionTheodore Ts'o2007-03-291-5/+5
| * | mergetool: portability fix: don't assume true is in /binTheodore Ts'o2007-03-291-2/+2
| * | mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o2007-03-291-6/+5
| * | mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o2007-03-291-14/+12
| * | Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-291-5/+5
* | | GIT 1.5.1-rc3v1.5.1-rc3Junio C Hamano2007-03-291-1/+1