summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2007-04-04add_cache_entry(): removal of file foo does not conflict with foo/barJunio C Hamano
2007-04-04Merge branch 'jc/bisect'Junio C Hamano
2007-04-04Merge branch 'fl/doc'Junio C Hamano
2007-04-04Merge branch 'post1.5.1/blame.el'Junio C Hamano
2007-04-04Merge branch 'post1.5.1/tcltk'Junio C Hamano
2007-04-04Merge branch 'post1.5.1/p4'Junio C Hamano
2007-04-04Merge branch 'lt/dirwalk'Junio C Hamano
2007-04-04GIT 1.5.1v1.5.1Junio C Hamano
2007-04-04Merge 1.5.0.7 inJunio C Hamano
2007-04-04GIT 1.5.0.7v1.5.0.7Junio C Hamano
2007-04-04Documentation: A few minor fixes to Git User's ManualJakub Narebski
2007-04-04Plug memory leak in index-pack collision checking codepath.Nicolas Pitre
2007-04-04rerere should not repeat the earlier hunks in later onesJunio C Hamano
2007-04-02Hopefully final update to the draft Release Notes, preparing for 1.5.1Junio C Hamano
2007-04-01Optional Tck/Tk: ignore generated files.Junio C Hamano
2007-04-01Eliminate checks of user-specified Tcl/Tk interpreter.Eygene Ryabinkin
2007-04-01Rewrite Tcl/Tk interpreter path for the GUI tools.Eygene Ryabinkin
2007-04-01Add --with-tcltk and --without-tcltk to configure.Eygene Ryabinkin
2007-04-01NO_TCLTKEygene Ryabinkin
2007-04-01Added correct Python path to the RPM specfile.Eygene Ryabinkin
2007-04-01Remove unused WITH_OWN_SUBPROCESS_PY from RPM specBrian Gernhardt
2007-04-01Added git-p4 package to the list of git RPMs.Eygene Ryabinkin
2007-04-01Add the WITH_P4IMPORT knob to the Makefile.Eygene Ryabinkin
2007-04-01git-blame.el: pick a set of random colors for each git-blame turnXavier Maillard
2007-04-01git-blame.el: separate git-blame-mode to ease maintenanceXavier Maillard
2007-04-01Optimize directory listing with pathspec limiter.Linus Torvalds
2007-03-31cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld
2007-03-31git-svn: fail on rebase if we are unable to find a ref to rebase againstEric Wong
2007-03-31Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen
2007-03-31contrib/workdir: add a simple script to create a working directoryJulian Phillips
2007-03-31Reimplement emailing part of hooks--update in contrib/hooks/post-receive-emailAndy Parkins
2007-03-31git-svn: avoid respewing similar error messages for missing pathsEric Wong
2007-03-31Rename warn() to warning() to fix symbol conflicts on BSD and Mac OSTheodore Ts'o
2007-03-31git-mailinfo fixes for patch mungingDon Zickus
2007-03-31gitweb: Support comparing blobs (files) with different namesJakub Narebski
2007-03-30Do not bother documenting fetch--toolJunio C Hamano
2007-03-30Update draft release notes for 1.5.1Junio C Hamano
2007-03-30Merge branch 'maint'Junio C Hamano
2007-03-30git-quiltimport /bin/sh-ism fixFrancis Daly
2007-03-30Bisect: Improve error message in "bisect_next_check".Christian Couder
2007-03-30Merge branch 'master' of git://repo.or.cz/git/mergetool.gitJunio C Hamano
2007-03-30mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o
2007-03-29mergetool: factor out common codeTheodore Ts'o
2007-03-29mergetool: portability fix: don't use reserved word functionTheodore Ts'o
2007-03-29mergetool: portability fix: don't assume true is in /binTheodore Ts'o
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o