summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Convert some "apply --summary" users to "diff --summary".Sean2006-05-143-4/+3
* Add "--summary" option to git diff.Sean2006-05-143-2/+93
* Merge branch 'fix'Junio C Hamano2006-05-142-0/+2
|\
| * include header to define uint32_t, necessary on Mac OS XBen Clifford2006-05-142-0/+2
* | Merge branch 'ml/cvs'Junio C Hamano2006-05-143-97/+187
|\ \
| * \ Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff...Junio C Hamano2006-05-093-97/+187
| |\ \
| | * | Change to allow subdir updates from EclipseMartyn Smith2006-05-081-11/+27
| | * | Many fixes for most operations in Eclipse.Martyn Smith2006-05-081-82/+139
| | * | Added logged warnings for CVS error returnsMartyn Smith2006-05-081-0/+2
| | * | Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-0858-819/+2848
| | |\ \
| | * | | cvsserver: use git-rev-list instead of git-logMartin Langhoff2006-05-041-2/+3
| | * | | Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-0311-63/+231
| | |\ \ \
| | * \ \ \ Merge with git://kernel.org/pub/scm/git/git.gitMartin Langhoff2006-05-0137-2321/+2423
| | |\ \ \ \
| | * | | | | git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.Martin Langhoff2006-04-262-8/+23
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-132-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix git-pack-objects for 64-bit platformsDennis Stosberg2006-05-132-2/+2
* | | | | | | fix diff-delta bad memory accessNicolas Pitre2006-05-101-5/+0
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-092-2/+2
|\ \ \ \ \ \ \
| * | | | | | | checkout: use --aggressive when running a 3-way merge (-m).Junio C Hamano2006-05-091-1/+1
| |/ / / / / /
| * | | | | | revert/cherry-pick: use aggressive merge.Linus Torvalds2006-05-091-1/+1
* | | | | | | Merge branch 'jc/clean'Junio C Hamano2006-05-092-5/+17
|\ \ \ \ \ \ \
| * | | | | | | Teach git-clean optional <paths>... parameters.Junio C Hamano2006-05-082-5/+17
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mw/alternates'Junio C Hamano2006-05-093-77/+212
|\ \ \ \ \ \ \
| * | | | | | | clone: don't clone the info/alternates fileMartin Waitz2006-05-071-5/+1
| * | | | | | | test case for transitive info/alternatesMartin Waitz2006-05-071-0/+105
| * | | | | | | Transitively read alternativesMartin Waitz2006-05-071-72/+106
* | | | | | | | Merge branch 'jc/xsha1'Junio C Hamano2006-05-091-8/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | get_sha1() - fix infinite loop on nonexistent stage.Junio C Hamano2006-05-081-0/+1
| * | | | | | | | get_sha1(): :path and :[0-3]:path to extract from index.Junio C Hamano2006-04-301-8/+46
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/again'Junio C Hamano2006-05-093-4/+142
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix users of prefix_path() to free() only when necessaryJohannes Schindelin2006-05-062-6/+6
| * | | | | | | | update-index --again: take optional pathspecsJunio C Hamano2006-05-052-2/+13
| * | | | | | | | update-index --againJunio C Hamano2006-05-053-4/+131
* | | | | | | | | Merge branch 'np/delta'Junio C Hamano2006-05-095-157/+353
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | improve diff-delta with sparse and/or repetitive dataNicolas Pitre2006-05-021-13/+27
| * | | | | | | | | tiny optimization to diff-deltaNicolas Pitre2006-05-021-3/+2
| * | | | | | | | | replace adler32 with Rabin's polynomial in diff-deltaNicolas Pitre2006-04-282-35/+151
| * | | | | | | | | use delta index data when finding best delta matchesNicolas Pitre2006-04-261-37/+41
| * | | | | | | | | split the diff-delta interfaceNicolas Pitre2006-04-243-92/+155
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/bindiff'Junio C Hamano2006-05-098-69/+575
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | improve base85 generated assembly codeNicolas Pitre2006-05-081-29/+35
| * | | | | | | | | binary diff and apply: testsuite.Junio C Hamano2006-05-062-0/+85
| * | | | | | | | | binary diff: further updates.Junio C Hamano2006-05-055-96/+304
| * | | | | | | | | binary patch.Junio C Hamano2006-05-054-68/+275
* | | | | | | | | | Merge branch 'fix'Junio C Hamano2006-05-092-10/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | read-cache.c: use xcalloc() not calloc()Yakov Lerner2006-05-091-1/+1
| * | | | | | | | apply: fix infinite loop with multiple patches with --indexEric Wong2006-05-091-9/+9
* | | | | | | | | Merge branch 'fix'Junio C Hamano2006-05-0816-41/+47
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Separate object name errors from usage errorsDmitry V. Levin2006-05-0813-25/+36
| * | | | | | | Documentation: {caret} fixes (git-rev-list.txt)Junio C Hamano2006-05-081-3/+4