summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix bogus error message from merge-recursive error pathJunio C Hamano2007-04-053-3/+2
* Show binary file size change in diff --statAndy Parkins2007-04-051-3/+10
* Fix lost-found to show commits only referenced by reflogsShawn O. Pearce2007-04-053-3/+15
* clean up and optimize nth_packed_object_sha1() usageNicolas Pitre2007-04-056-25/+24
* RPM spec: include git-p4 in the list of all packages.Junio C Hamano2007-04-041-1/+1
* git-svn: bail out on incorrect command-line optionsEric Wong2007-04-041-1/+4
* gitweb: Quote hash keys, and do not use barewords keysJakub Narebski2007-04-041-8/+8
* gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)Jakub Narebski2007-04-041-24/+24
* Merge branch 'jc/bisect'Junio C Hamano2007-04-044-20/+338
|\
| * make the previous optimization work also on path-limited rev-list --bisectJunio C Hamano2007-03-231-98/+151
| * rev-list --bisect: Fix "halfway" optimization.Junio C Hamano2007-03-231-6/+26
| * Merge branch 'master' into jc/bisectJunio C Hamano2007-03-2315-68/+274
| |\
| * | t6004: add a bit more path optimization test.Junio C Hamano2007-03-231-1/+33
| * | git-rev-list --bisect: optimizationJunio C Hamano2007-03-221-2/+160
| * | git-rev-list: add --bisect-vars option.Junio C Hamano2007-03-222-6/+61
| * | t6002: minor spelling fix.Junio C Hamano2007-03-221-1/+1
* | | Merge branch 'fl/doc'Junio C Hamano2007-04-042-3/+37
|\ \ \
| * | | Documentation: unbreak user-manual.Junio C Hamano2007-03-281-0/+2
| * | | Documentation: Add version information to man pagesFrank Lichtenheld2007-03-281-0/+17
| * | | Documentation: Replace @@GIT_VERSION@@ in documentationFrank Lichtenheld2007-03-281-3/+18
* | | | Merge branch 'post1.5.1/blame.el'Junio C Hamano2007-04-041-46/+92
|\ \ \ \
| * | | | git-blame.el: pick a set of random colors for each git-blame turnXavier Maillard2007-03-311-28/+55
| * | | | git-blame.el: separate git-blame-mode to ease maintenanceXavier Maillard2007-03-311-18/+37
* | | | | Merge branch 'post1.5.1/tcltk'Junio C Hamano2007-04-044-5/+78
|\ \ \ \ \
| * | | | | Optional Tck/Tk: ignore generated files.Junio C Hamano2007-03-311-0/+2
| * | | | | Eliminate checks of user-specified Tcl/Tk interpreter.Eygene Ryabinkin2007-03-311-3/+1
| * | | | | Rewrite Tcl/Tk interpreter path for the GUI tools.Eygene Ryabinkin2007-03-311-3/+24
| * | | | | Add --with-tcltk and --without-tcltk to configure.Eygene Ryabinkin2007-03-313-1/+38
| * | | | | NO_TCLTKEygene Ryabinkin2007-03-311-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-03-311-1/+5
| * | | | | Remove unused WITH_OWN_SUBPROCESS_PY from RPM specBrian Gernhardt2007-03-311-5/+4
| * | | | | Added git-p4 package to the list of git RPMs.Eygene Ryabinkin2007-03-311-4/+21
| * | | | | Add the WITH_P4IMPORT knob to the Makefile.Eygene Ryabinkin2007-03-311-0/+26
| |/ / / /
* | | | | Merge branch 'lt/dirwalk'Junio C Hamano2007-04-045-9/+95
|\ \ \ \ \
| * | | | | Optimize directory listing with pathspec limiter.Linus Torvalds2007-03-315-9/+95
| |/ / / /
* | | | | GIT 1.5.1v1.5.1Junio C Hamano2007-04-033-16/+187
* | | | | Merge 1.5.0.7 inJunio C Hamano2007-04-033-4/+44
|\ \ \ \ \
| * | | | | GIT 1.5.0.7v1.5.0.7Junio C Hamano2007-04-033-2/+20
| * | | | | rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-032-4/+26
* | | | | | Documentation: A few minor fixes to Git User's ManualJakub Narebski2007-04-031-10/+10
* | | | | | Plug memory leak in index-pack collision checking codepath.Nicolas Pitre2007-04-031-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-03-311-3/+5
* | | | | git-svn: fail on rebase if we are unable to find a ref to rebase againstEric Wong2007-03-311-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