summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/config-rename'Junio C Hamano2007-03-084-25/+74
|\
| * git-config: document --rename-section, provide --remove-sectionPaolo Bonzini2007-03-034-25/+74
* | Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-03-073-18/+88
|\ \
| * | Allow fast-import frontends to reload the marks tableShawn O. Pearce2007-03-073-1/+56
| * | Use atomic updates to the fast-import mark fileShawn O. Pearce2007-03-071-9/+26
| * | Preallocate memory earlier in fast-importShawn O. Pearce2007-03-071-8/+6
* | | Teach receive-pack to run pre-receive/post-receive hooksShawn O. Pearce2007-03-073-62/+191
* | | Refactor handling of error_string in receive-packShawn O. Pearce2007-03-072-32/+36
* | | Refactor run_update_hook to be more usefulShawn O. Pearce2007-03-071-19/+44
* | | Don't run post-update hook unless a ref changedShawn O. Pearce2007-03-071-4/+4
* | | Move post-update hook to after all other activityShawn O. Pearce2007-03-071-2/+1
* | | Merge branch 'maint'Junio C Hamano2007-03-072-2/+6
|\ \ \
| * | | Catch write_ref_sha1 failure in receive-packShawn O. Pearce2007-03-071-1/+4
| * | | make t8001 work on Mac OS X againJohannes Schindelin2007-03-061-1/+2
* | | | Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-0716-59/+83
* | | | Use off_t in pack-objects/fast-import when we mean an offsetShawn O. Pearce2007-03-072-28/+28
* | | | Use off_t when we really mean a file offset.Shawn O. Pearce2007-03-076-47/+54
* | | | Use uint32_t for pack-objects counters.Shawn O. Pearce2007-03-071-33/+30
* | | | Use uint32_t for all packed object counts.Shawn O. Pearce2007-03-075-15/+15
* | | | General const correctness fixesShawn O. Pearce2007-03-0716-42/+40
* | | | Don't build external_grep if its not usedShawn O. Pearce2007-03-071-0/+2
* | | | Fix mmap leak caused by reading bad indexes.Shawn O. Pearce2007-03-071-9/+16
* | | | Display the null SHA-1 as the base for an OBJ_OFS_DELTA.Shawn O. Pearce2007-03-071-0/+1
* | | | git-archimport: allow remapping branch namesPaolo Bonzini2007-03-072-24/+81
* | | | t/t5515-fetch-merge-logic.sh: Add two more testsSanti B,Ai(Bjar2007-03-073-0/+5
* | | | gitweb: Don't escape attributes in CGI.pm HTML methodsJakub Narebski2007-03-061-3/+3
| |/ / |/| |
* | | gitweb: Change to use explicitly function call cgi->escapHTML()Li Yang2007-03-061-2/+2
* | | Merge branch 'maint'Junio C Hamano2007-03-062-37/+69
|\ \ \ | |/ /
| * | Merge branch 'master' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-03-062-37/+69
| |\ \
| | * | git-gui: Make 'make' quieter by defaultgitgui-0.6.3Shawn O. Pearce2007-03-061-7/+15
| | * | git-gui: Remove unnecessary /dev/null redirection.Shawn O. Pearce2007-03-011-8/+2
| | * | git-gui: Don't create empty (same tree as parent) commits.gitgui-0.6.2Shawn O. Pearce2007-02-261-0/+18
| | * | git-gui: Add Reset to the Branch menu.Shawn O. Pearce2007-02-261-0/+6
| | * | git-gui: Relocate the menu/transport menu code.Shawn O. Pearce2007-02-261-22/+28
* | | | git-bundle: fix pack generation.Junio C Hamano2007-03-051-0/+6
* | | | Merge branch 'maint'Junio C Hamano2007-03-051-0/+3
|\ \ \ \ | |/ / /
| * | | git-commit: cd to top before showing the final statJunio C Hamano2007-03-051-0/+3
| | | |
| \ \ \
*-. \ \ \ Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'm...Junio C Hamano2007-03-055-9/+57
|\ \ \ \ \ | | |/ / /
| | * | | Fix diff-options references in git-diff and git-format-patchBrian Gernhardt2007-03-052-3/+5
| | * | | Add definition of <commit-ish> to the main git man page.Theodore Ts'o2007-03-051-0/+6
| | * | | Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-03-051-6/+19
| | |\ \ \
| | * | | | Begin SubmittingPatches with a check listJohannes Schindelin2007-03-051-0/+27
| * | | | | Merge branch 'maint'Shawn O. Pearce2007-03-051-6/+19
| |\ \ \ \ \ |/ / / / / / | | | _ / / | | | / /
| * | | | fast-import: Fail if a non-existant commit is used for mergeShawn O. Pearce2007-03-051-1/+8
| * | | | fast-import: Avoid infinite loop after resetShawn O. Pearce2007-03-051-5/+11
| |/ / /
* | | | contrib/emacs: Use non-interactive function to byte-compile filesXavier Maillard2007-03-051-2/+2
* | | | t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetchSanti BĂ©jar2007-03-0563-0/+731
* | | | Post 1.5.0.3 cleanupJunio C Hamano2007-03-042-4/+14
* | | | Merge branch 'js/fetch-progress' (early part)Junio C Hamano2007-03-046-14/+47
|\ \ \ \
| * | | | Fixup no-progress for fetch & cloneJohannes Schindelin2007-02-244-18/+9