aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| * | | | | | apply: fix infinite loop with multiple patches with --indexEric Wong2006-05-09
* | | | | | | Merge branch 'fix'Junio C Hamano2006-05-08
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Separate object name errors from usage errorsDmitry V. Levin2006-05-08
| * | | | | Documentation: {caret} fixes (git-rev-list.txt)Junio C Hamano2006-05-08
| * | | | | Fix "git diff --stat" with long filenamesLinus Torvalds2006-05-08
| * | | | | Fix repo-config set-multivar error return path.Junio C Hamano2006-05-07
* | | | | | Merge branch 'fix'Junio C Hamano2006-05-07
|\ \ \ \ \ \ | |/ / / / /
| * | | | | repack: honor -d even when no new pack was createdMartin Waitz2006-05-07
| * | | | | clone: keep --reference even with -l -sMartin Waitz2006-05-07
| * | | | | repo-config: document what value_regexp does a bit more clearly.Junio C Hamano2006-05-07
| * | | | | Release config lock if the regex is invalidPavel Roskin2006-05-07
| * | | | | core-tutorial.txt: escape asteriskMatthias Lederhofer2006-05-07
* | | | | | Sparse fix for builtin-diffPeter Hagervall2006-05-07
* | | | | | Fix users of prefix_path() to free() only when necessaryJohannes Schindelin2006-05-06
* | | | | | t1300-repo-config: two new config parsing tests.sean2006-05-06
* | | | | | Another config file parsing fix.sean2006-05-06
| |_|_|/ / |/| | | |
* | | | | update-index: plug memory leak from prefix_path()Junio C Hamano2006-05-05
* | | | | checkout-index: plug memory leak from prefix_path()Junio C Hamano2006-05-05
* | | | | update-index --unresolve: work from a subdirectory.Junio C Hamano2006-05-05
| |/ / / |/| | |
* | | | pack-object: squelch eye-candy on non-ttyJunio C Hamano2006-05-05
* | | | Merge branch 'fix'Junio C Hamano2006-05-05
|\ \ \ \ | |/ / /