summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* user-manual: typo and grammar fixesEric Hanchrow2008-07-081-9/+9
* Merge branch 'qq/maint'Junio C Hamano2008-07-071-0/+2
|\
| * run_command(): respect GIT_TRACEJohannes Schindelin2008-07-071-0/+2
* | gitweb: Describe projects_index format in more detailJakub Narebski2008-07-072-6/+46
* | Merge branch 'js/maint-daemon-syslog'Junio C Hamano2008-07-071-20/+50
|\ \
| * | git daemon: avoid calling syslog() from a signal handlerJohannes Schindelin2008-07-061-20/+50
* | | Merge branch 'maint'Junio C Hamano2008-07-071-0/+2
|\ \ \
| * \ \ Merge branch 'qq/maint' (early part) into maintJunio C Hamano2008-07-0715-88/+73
| |\ \ \ | | | |/ | | |/|
| | * | git-svn.perl: workaround assertions in svn library 1.5.0Gerrit Pape2008-07-071-0/+2
* | | | Update draft release notes for 1.6.0Junio C Hamano2008-07-071-8/+22
* | | | Merge branch 'jc/rerere'Junio C Hamano2008-07-073-44/+95
|\ \ \ \
| * | | | rerere.autoupdateJunio C Hamano2008-06-223-0/+52
| * | | | t4200: fix rerere testJunio C Hamano2008-06-221-3/+3
| * | | | rerere: remove dubious "tail_optimization"Junio C Hamano2008-06-221-10/+9
| * | | | git-rerere: detect unparsable conflictsJunio C Hamano2008-06-221-0/+5
| * | | | rerere: rerere_created_at() and has_resolution() abstractionJunio C Hamano2008-06-221-31/+26
* | | | | Merge branch 'dr/ceiling'Junio C Hamano2008-07-0712-32/+406
|\ \ \ \ \
| * | | | | Eliminate an unnecessary chdir("..")David Reiss2008-05-231-1/+1
| * | | | | Add support for GIT_CEILING_DIRECTORIESDavid Reiss2008-05-238-11/+282
| * | | | | Fold test-absolute-path into test-path-utilsDavid Reiss2008-05-235-17/+13
| * | | | | Implement normalize_absolute_pathDavid Reiss2008-05-236-1/+109
* | | | | | Merge branch 'db/no-git-config'Junio C Hamano2008-07-075-45/+33
|\ \ \ \ \ \
| * | | | | | Only use GIT_CONFIG in "git config", not other programsDaniel Barkalow2008-07-015-45/+33
* | | | | | | Merge branch 'js/import-zip'Junio C Hamano2008-07-071-0/+72
|\ \ \ \ \ \ \
| * | | | | | | Add another fast-import example, this time for .zip filesJohannes Schindelin2008-07-011-0/+72
| |/ / / / / /
* | | | | | | Merge branch 'maint'Junio C Hamano2008-07-071-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix grammar in git-rev-parse(1).Mikael Magnusson2008-07-061-2/+2
* | | | | | | Merge branch 'qq/maint'Junio C Hamano2008-07-072-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | mailinfo: feed the correct line length to decode_transfer_encoding()Junio C Hamano2008-07-061-0/+1
| * | | | | | git-clone: remove leftover debugging fprintf().Alex Riesen2008-07-061-1/+0
* | | | | | | completion.bash: add 'skip' and 'run' to git-bisectDmitry Potapov2008-07-071-2/+2
* | | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-062-3/+125
|\ \ \ \ \ \ \
| * | | | | | | git-gui: Implement "Stage/Unstage Line"Johannes Sixt2008-07-022-0/+95
| * | | | | | | git-gui: Don't select the wrong file if the last listed file is staged.Abhijit Menon-Sen2008-06-251-2/+4
| * | | | | | | git-gui: Fix accidental staged state toggle when clicking top pixel rowRichard Quirk2008-06-201-1/+1
| * | | | | | | git-gui: Move on to the next filename after staging/unstaging a changeAbhijit Menon-Sen2008-06-131-2/+27
* | | | | | | | Merge branch 'qq/maint'Junio C Hamano2008-07-060-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix "config_error_nonbool" used with value instead of keyChristian Couder2008-07-051-1/+1
* | | | | | | | hg-to-git: use git init instead of git init-dbMiklos Vajna2008-07-051-1/+1
* | | | | | | | hg-to-git: rewrite "git-frotz" to "git frotz"Miklos Vajna2008-07-051-10/+10
* | | | | | | | hg-to-git: abort if the project directory is not a hg repoMiklos Vajna2008-07-051-1/+4
* | | | | | | | hg-to-git: avoid raising a string exceptionMiklos Vajna2008-07-051-1/+1
* | | | | | | | INSTALL: Update section about git-frotz form.Miklos Vajna2008-07-051-12/+6
* | | | | | | | Fix "config_error_nonbool" used with value instead of keyChristian Couder2008-07-052-2/+2
* | | | | | | | Merge branch 'qq/maint'Junio C Hamano2008-07-0511-92/+75
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | clone -q: honor "quiet" option over native transports.Junio C Hamano2008-07-051-1/+3
| * | | | | | | attribute documentation: keep EXAMPLE at endJunio C Hamano2008-07-051-16/+17
| * | | | | | | builtin-commit.c: Use 'git_config_string' to get 'commit.template'Brian Hetro2008-07-051-7/+4
| * | | | | | | http.c: Use 'git_config_string' to clean up SSL config.Brian Hetro2008-07-051-24/+12
| * | | | | | | diff.c: Use 'git_config_string' to get 'diff.external'Brian Hetro2008-07-051-6/+2