Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Convert some "apply --summary" users to "diff --summary". | Sean | 2006-05-14 | 3 | -4/+3 |
* | Add "--summary" option to git diff. | Sean | 2006-05-14 | 3 | -2/+93 |
* | Merge branch 'fix' | Junio C Hamano | 2006-05-14 | 2 | -0/+2 |
|\ | |||||
| * | include header to define uint32_t, necessary on Mac OS X | Ben Clifford | 2006-05-14 | 2 | -0/+2 |
* | | Merge branch 'ml/cvs' | Junio C Hamano | 2006-05-14 | 3 | -97/+187 |
|\ \ | |||||
| * \ | Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff... | Junio C Hamano | 2006-05-09 | 3 | -97/+187 |
| |\ \ | |||||
| | * | | Change to allow subdir updates from Eclipse | Martyn Smith | 2006-05-08 | 1 | -11/+27 |
| | * | | Many fixes for most operations in Eclipse. | Martyn Smith | 2006-05-08 | 1 | -82/+139 |
| | * | | Added logged warnings for CVS error returns | Martyn Smith | 2006-05-08 | 1 | -0/+2 |
| | * | | Merge with git://kernel.org/pub/scm/git/git.git | Martin Langhoff | 2006-05-08 | 58 | -819/+2848 |
| | |\ \ | |||||
| | * | | | cvsserver: use git-rev-list instead of git-log | Martin Langhoff | 2006-05-04 | 1 | -2/+3 |
| | * | | | Merge with git://kernel.org/pub/scm/git/git.git | Martin Langhoff | 2006-05-03 | 11 | -63/+231 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge with git://kernel.org/pub/scm/git/git.git | Martin Langhoff | 2006-05-01 | 37 | -2321/+2423 |
| | |\ \ \ \ | |||||
| | * | | | | | git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups. | Martin Langhoff | 2006-04-26 | 2 | -8/+23 |
* | | | | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-13 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Fix git-pack-objects for 64-bit platforms | Dennis Stosberg | 2006-05-13 | 2 | -2/+2 |
* | | | | | | | fix diff-delta bad memory access | Nicolas Pitre | 2006-05-10 | 1 | -5/+0 |
* | | | | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-09 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | checkout: use --aggressive when running a 3-way merge (-m). | Junio C Hamano | 2006-05-09 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | revert/cherry-pick: use aggressive merge. | Linus Torvalds | 2006-05-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jc/clean' | Junio C Hamano | 2006-05-09 | 2 | -5/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Teach git-clean optional <paths>... parameters. | Junio C Hamano | 2006-05-08 | 2 | -5/+17 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mw/alternates' | Junio C Hamano | 2006-05-09 | 3 | -77/+212 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: don't clone the info/alternates file | Martin Waitz | 2006-05-07 | 1 | -5/+1 |
| * | | | | | | | test case for transitive info/alternates | Martin Waitz | 2006-05-07 | 1 | -0/+105 |
| * | | | | | | | Transitively read alternatives | Martin Waitz | 2006-05-07 | 1 | -72/+106 |
* | | | | | | | | Merge branch 'jc/xsha1' | Junio C Hamano | 2006-05-09 | 1 | -8/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | get_sha1() - fix infinite loop on nonexistent stage. | Junio C Hamano | 2006-05-08 | 1 | -0/+1 |
| * | | | | | | | | get_sha1(): :path and :[0-3]:path to extract from index. | Junio C Hamano | 2006-04-30 | 1 | -8/+46 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/again' | Junio C Hamano | 2006-05-09 | 3 | -4/+142 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix users of prefix_path() to free() only when necessary | Johannes Schindelin | 2006-05-06 | 2 | -6/+6 |
| * | | | | | | | | update-index --again: take optional pathspecs | Junio C Hamano | 2006-05-05 | 2 | -2/+13 |
| * | | | | | | | | update-index --again | Junio C Hamano | 2006-05-05 | 3 | -4/+131 |
* | | | | | | | | | Merge branch 'np/delta' | Junio C Hamano | 2006-05-09 | 5 | -157/+353 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | improve diff-delta with sparse and/or repetitive data | Nicolas Pitre | 2006-05-02 | 1 | -13/+27 |
| * | | | | | | | | | tiny optimization to diff-delta | Nicolas Pitre | 2006-05-02 | 1 | -3/+2 |
| * | | | | | | | | | replace adler32 with Rabin's polynomial in diff-delta | Nicolas Pitre | 2006-04-28 | 2 | -35/+151 |
| * | | | | | | | | | use delta index data when finding best delta matches | Nicolas Pitre | 2006-04-26 | 1 | -37/+41 |
| * | | | | | | | | | split the diff-delta interface | Nicolas Pitre | 2006-04-24 | 3 | -92/+155 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/bindiff' | Junio C Hamano | 2006-05-09 | 8 | -69/+575 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | improve base85 generated assembly code | Nicolas Pitre | 2006-05-08 | 1 | -29/+35 |
| * | | | | | | | | | binary diff and apply: testsuite. | Junio C Hamano | 2006-05-06 | 2 | -0/+85 |
| * | | | | | | | | | binary diff: further updates. | Junio C Hamano | 2006-05-05 | 5 | -96/+304 |
| * | | | | | | | | | binary patch. | Junio C Hamano | 2006-05-05 | 4 | -68/+275 |
* | | | | | | | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-09 | 2 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | read-cache.c: use xcalloc() not calloc() | Yakov Lerner | 2006-05-09 | 1 | -1/+1 |
| * | | | | | | | | apply: fix infinite loop with multiple patches with --index | Eric Wong | 2006-05-09 | 1 | -9/+9 |
* | | | | | | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-08 | 16 | -41/+47 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Separate object name errors from usage errors | Dmitry V. Levin | 2006-05-08 | 13 | -25/+36 |
| * | | | | | | | Documentation: {caret} fixes (git-rev-list.txt) | Junio C Hamano | 2006-05-08 | 1 | -3/+4 |