summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | fetch & clone: do not output progress when not on a ttyJohannes Schindelin2007-02-196-13/+55
* | | | Merge branch 'js/symlink'Junio C Hamano2007-03-0415-13/+175
|\ \ \ \
| * | | | Tell multi-parent diff about core.symlinks.Johannes Sixt2007-03-031-0/+10
| * | | | Handle core.symlinks=false case in merge-recursive.Johannes Sixt2007-03-032-1/+64
| * | | | Add core.symlinks to mark filesystems that do not support symbolic links.Johannes Sixt2007-03-0212-12/+101
* | | | | Merge branch 'maint'Junio C Hamano2007-03-045-48/+167
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | GIT 1.5.0.3v1.5.0.3Junio C Hamano2007-03-042-12/+15
| * | | | glossary: Add definitions for dangling and unreachable objectsYasushi SHOJI2007-03-041-0/+9
| * | | | user-manual: more detailed merge discussionJ. Bruce Fields2007-03-041-25/+77
| * | | | user-manual: how to replace commits older than most recentJ. Bruce Fields2007-03-041-0/+46
| * | | | user-manual: insert earlier of mention content-addressable architectureJ. Bruce Fields2007-03-041-9/+15
| * | | | user-manual: ensure generated manual references stylesheetJ. Bruce Fields2007-03-041-1/+4
| * | | | user-manual: reset to ORIG_HEAD not HEAD to undo mergeJ. Bruce Fields2007-03-041-1/+1
| * | | | Documentation: mention module option to git-cvsimportJ. Bruce Fields2007-03-041-1/+1
* | | | | git-svn: fix show-ignore when not connected to the repository rootEric Wong2007-03-041-2/+2
* | | | | diff-ni: allow running from a subdirectory.Junio C Hamano2007-03-031-1/+13
* | | | | Merge branch 'js/diff-ni' (early part)Junio C Hamano2007-03-034-2/+64
|\ \ \ \ \
| * | | | | diff: make more cases implicit --no-indexJohannes Schindelin2007-02-284-2/+64
View Lorry Controller Status