summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cvsserver: Note that CVS_SERVER can also be specified as method variableFrank Lichtenheld2007-05-291-1/+11
* cvsserver: Correct inetd.conf example in asciidoc documentationFrank Lichtenheld2007-05-291-3/+5
* user-manual: fixed typo in exampleSteffen Prohaska2007-05-281-1/+1
* Add test case for $Id$ expanded in the repositoryAndy Parkins2007-05-281-0/+36
* Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-282-7/+11
|\
| * git-svn: avoid md5 calculation entirely if SVN doesn't provide oneEric Wong2007-05-281-6/+10
| * Fix stupid typo in lookup_tag()Johan Herland2007-05-281-1/+1
* | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-05-282-10/+19
|\ \
| * | git-gui: Guess our share/git-gui/lib path at runtime if possiblegitgui-0.7.2Shawn O. Pearce2007-05-272-4/+16
| * | Correct key bindings to Control-<foo>Shawn O. Pearce2007-05-241-6/+3
| * | git-gui: Tighten internal pattern match for lib/ directoryShawn O. Pearce2007-05-221-1/+1
* | | Makefile: Remove git-fsck and git-verify-pack from PROGRAMSNguyen Thai Ngoc Duy2007-05-281-2/+2
* | | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-2610-47/+115
|\ \ \ | | |/ | |/|
| * | Fix git-svn to handle svn not reporting the md5sum of a file, and test.James Y Knight2007-05-262-1/+46
| * | More echo "$user_message" fixes.Jeff King2007-05-263-6/+6
| * | Add tests for the last two fixes.Junio C Hamano2007-05-261-3/+22
| * | git-commit: use printf '%s\n' instead of echo on user-supplied stringsJunio C Hamano2007-05-261-4/+4
| * | git-am: use printf instead of echo on user-supplied stringsJeff King2007-05-251-2/+2
| * | Documentation: Add definition of "evil merge" to GIT GlossaryJakub Narebski2007-05-251-0/+4
| * | Replace the last 'dircache's by 'index'Jakub Narebski2007-05-252-2/+2
| * | Documentation: Clean up links in GIT GlossaryJakub Narebski2007-05-251-29/+29
* | | Fix mishandling of $Id$ expanded in the repository copy in convert.cAndy Parkins2007-05-261-2/+37
* | | Merge branch 'master' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-05-241-10/+71
|\ \ \
| * | | Update bash completion for git-config optionsShawn O. Pearce2007-05-241-2/+12
| * | | Teach bash completion about recent log long optionsShawn O. Pearce2007-05-241-2/+2
| * | | Teach bash completion about 'git remote update'Shawn O. Pearce2007-05-241-2/+14
| * | | Update bash completion header documentationShawn O. Pearce2007-05-241-1/+14
| * | | Remove a duplicate --not option in bash completionShawn O. Pearce2007-05-241-1/+1
| * | | Teach bash completion about git-shortlogShawn O. Pearce2007-05-241-0/+23
| * | | Hide the plumbing diff-{files,index,tree} from bash completionShawn O. Pearce2007-05-241-3/+3
| * | | Update bash completion to ignore some more plumbing commandsJonas Fonseca2007-05-211-0/+3
* | | | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-242-0/+5
|\ \ \ \ | | |/ / | |/| |
| * | | fix memory leak in parse_object when check_sha1_signature failsCarlos Rica2007-05-241-0/+1
| * | | name-rev: tolerate clock skew in committer datesJunio C Hamano2007-05-241-0/+4
* | | | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-05-232-30/+66
|\ \ \ \
| * | | | Fix possible coredump with fast-import --import-marksShawn O. Pearce2007-05-242-5/+36
| * | | | Refactor fast-import branch creation from existing commitShawn O. Pearce2007-05-241-27/+31
| * | | | fast-import: Fix crash when referencing already existing objectsSimon Hausmann2007-05-231-1/+1
| * | | | fast-import: Fix uninitialized variableSimon Hausmann2007-05-231-0/+1
* | | | | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-231-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Documentation: fix git-config.xml generationJames Bowes2007-05-231-1/+1
* | | | Use git-for-each-ref to check whether the origin branch exists.Stephan Springl2007-05-231-5/+5
* | | | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-231-0/+7
|\ \ \ \ | |/ / /
| * | | Document branch.autosetupmerge.Paolo Bonzini2007-05-221-0/+7
* | | | git-cvsserver: fix disabling service via per-method configJunio C Hamano2007-05-211-5/+3
* | | | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-216-2/+54
|\ \ \ \ | |/ / /
| * | | git-status: respect core.excludesFileJohannes Schindelin2007-05-214-0/+39
| * | | SubmittingPatches: mention older C compiler compatibilityJohannes Schindelin2007-05-211-0/+13
| * | | git-daemon: don't ignore pid-file write failureJim Meyering2007-05-211-2/+2
* | | | Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-206-18/+48
|\ \ \ \ | |/ / / | | / / | |/ / |/| |