aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* pack-object: slightly more efficientNicolas Pitre2006-05-15
* simple euristic for further free packing improvementsNicolas Pitre2006-05-15
* read-tree --reset -u fix.Linus Torvalds2006-05-15
* read-tree -u one-way merge fix to check out locally modified paths.Junio C Hamano2006-05-15
* Simplify "git reset --hard"Linus Torvalds2006-05-14
* Allow one-way tree merge to remove old filesLinus Torvalds2006-05-14
* Merge branch 'fix'Junio C Hamano2006-05-14
|\
| * include header to define uint32_t, necessary on Mac OS XBen Clifford2006-05-14
* | Merge branch 'ml/cvs'Junio C Hamano2006-05-14
|\ \
| * \ Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff...Junio C Hamano2006-05-09
| |\ \
| | * | Change to allow subdir updates from EclipseMartyn Smith2006-05-08
| | * | Many fixes for most operations in Eclipse.Martyn Smith2006-05-08
| | * | Added logged warnings for CVS error returnsMartyn Smith2006-05-08
| | * | Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-08
| | |\ \
| | * | | cvsserver: use git-rev-list instead of git-logMartin Langhoff2006-05-04
| | * | | Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-03
| | |\ \ \
| | * \ \ \ Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-01
| | |\ \ \ \
| | * | | | | git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.Martin Langhoff2006-04-26
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-13
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix git-pack-objects for 64-bit platformsDennis Stosberg2006-05-13
* | | | | | | fix diff-delta bad memory accessNicolas Pitre2006-05-10
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \
| * | | | | | | checkout: use --aggressive when running a 3-way merge (-m).Junio C Hamano2006-05-09
| |/ / / / / /
| * | | | | | revert/cherry-pick: use aggressive merge.Linus Torvalds2006-05-09
* | | | | | | Merge branch 'jc/clean'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \
| * | | | | | | Teach git-clean optional <paths>... parameters.Junio C Hamano2006-05-08
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mw/alternates'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \
| * | | | | | | clone: don't clone the info/alternates fileMartin Waitz2006-05-07
| * | | | | | | test case for transitive info/alternatesMartin Waitz2006-05-07
| * | | | | | | Transitively read alternativesMartin Waitz2006-05-07
* | | | | | | | Merge branch 'jc/xsha1'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \ \
| * | | | | | | | get_sha1() - fix infinite loop on nonexistent stage.Junio C Hamano2006-05-08
| * | | | | | | | get_sha1(): :path and :[0-3]:path to extract from index.Junio C Hamano2006-04-30
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/again'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix users of prefix_path() to free() only when necessaryJohannes Schindelin2006-05-06
| * | | | | | | | update-index --again: take optional pathspecsJunio C Hamano2006-05-05
| * | | | | | | | update-index --againJunio C Hamano2006-05-05
* | | | | | | | | Merge branch 'np/delta'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | improve diff-delta with sparse and/or repetitive dataNicolas Pitre2006-05-02
| * | | | | | | | | tiny optimization to diff-deltaNicolas Pitre2006-05-02
| * | | | | | | | | replace adler32 with Rabin's polynomial in diff-deltaNicolas Pitre2006-04-28
| * | | | | | | | | use delta index data when finding best delta matchesNicolas Pitre2006-04-26
| * | | | | | | | | split the diff-delta interfaceNicolas Pitre2006-04-24
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/bindiff'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | improve base85 generated assembly codeNicolas Pitre2006-05-08
| * | | | | | | | | binary diff and apply: testsuite.Junio C Hamano2006-05-06
| * | | | | | | | | binary diff: further updates.Junio C Hamano2006-05-05
| * | | | | | | | | binary patch.Junio C Hamano2006-05-05
* | | | | | | | | | Merge branch 'fix'Junio C Hamano2006-05-09
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | read-cache.c: use xcalloc() not calloc()Yakov Lerner2006-05-09