Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'fix' | Junio C Hamano | 2006-05-09 |
|\ | |||
| * | checkout: use --aggressive when running a 3-way merge (-m). | Junio C Hamano | 2006-05-09 |
| * | revert/cherry-pick: use aggressive merge. | Linus Torvalds | 2006-05-09 |
* | | Merge branch 'jc/clean' | Junio C Hamano | 2006-05-09 |
|\ \ | |||
| * | | Teach git-clean optional <paths>... parameters. | Junio C Hamano | 2006-05-08 |
* | | | Merge branch 'mw/alternates' | Junio C Hamano | 2006-05-09 |
|\ \ \ | |||
| * | | | clone: don't clone the info/alternates file | Martin Waitz | 2006-05-07 |
| * | | | test case for transitive info/alternates | Martin Waitz | 2006-05-07 |
| * | | | Transitively read alternatives | Martin Waitz | 2006-05-07 |
* | | | | Merge branch 'jc/xsha1' | Junio C Hamano | 2006-05-09 |
|\ \ \ \ | |||
| * | | | | get_sha1() - fix infinite loop on nonexistent stage. | Junio C Hamano | 2006-05-08 |
| * | | | | get_sha1(): :path and :[0-3]:path to extract from index. | Junio C Hamano | 2006-04-30 |
* | | | | | Merge branch 'jc/again' | Junio C Hamano | 2006-05-09 |
|\ \ \ \ \ | |||
| * | | | | | Fix users of prefix_path() to free() only when necessary | Johannes Schindelin | 2006-05-06 |
| * | | | | | update-index --again: take optional pathspecs | Junio C Hamano | 2006-05-05 |
| * | | | | | update-index --again | Junio C Hamano | 2006-05-05 |
* | | | | | | Merge branch 'np/delta' | Junio C Hamano | 2006-05-09 |
|\ \ \ \ \ \ | |||
| * | | | | | | improve diff-delta with sparse and/or repetitive data | Nicolas Pitre | 2006-05-02 |
| * | | | | | | tiny optimization to diff-delta | Nicolas Pitre | 2006-05-02 |
| * | | | | | | replace adler32 with Rabin's polynomial in diff-delta | Nicolas Pitre | 2006-04-28 |
| * | | | | | | use delta index data when finding best delta matches | Nicolas Pitre | 2006-04-26 |
| * | | | | | | split the diff-delta interface | Nicolas Pitre | 2006-04-24 |
* | | | | | | | Merge branch 'jc/bindiff' | Junio C Hamano | 2006-05-09 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | improve base85 generated assembly code | Nicolas Pitre | 2006-05-08 |
| * | | | | | | | binary diff and apply: testsuite. | Junio C Hamano | 2006-05-06 |
| * | | | | | | | binary diff: further updates. | Junio C Hamano | 2006-05-05 |
| * | | | | | | | binary patch. | Junio C Hamano | 2006-05-05 |
* | | | | | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-09 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | read-cache.c: use xcalloc() not calloc() | Yakov Lerner | 2006-05-09 |
| * | | | | | | apply: fix infinite loop with multiple patches with --index | Eric Wong | 2006-05-09 |
* | | | | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-08 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||
| * | | | | | Separate object name errors from usage errors | Dmitry V. Levin | 2006-05-08 |
| * | | | | | Documentation: {caret} fixes (git-rev-list.txt) | Junio C Hamano | 2006-05-08 |
| * | | | | | Fix "git diff --stat" with long filenames | Linus Torvalds | 2006-05-08 |
| * | | | | | Fix repo-config set-multivar error return path. | Junio C Hamano | 2006-05-07 |
* | | | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-07 |
|\ \ \ \ \ \ | |/ / / / / | |||
| * | | | | | repack: honor -d even when no new pack was created | Martin Waitz | 2006-05-07 |
| * | | | | | clone: keep --reference even with -l -s | Martin Waitz | 2006-05-07 |
| * | | | | | repo-config: document what value_regexp does a bit more clearly. | Junio C Hamano | 2006-05-07 |
| * | | | | | Release config lock if the regex is invalid | Pavel Roskin | 2006-05-07 |
| * | | | | | core-tutorial.txt: escape asterisk | Matthias Lederhofer | 2006-05-07 |
* | | | | | | Sparse fix for builtin-diff | Peter Hagervall | 2006-05-07 |
* | | | | | | Fix users of prefix_path() to free() only when necessary | Johannes Schindelin | 2006-05-06 |
* | | | | | | t1300-repo-config: two new config parsing tests. | sean | 2006-05-06 |
* | | | | | | Another config file parsing fix. | sean | 2006-05-06 |
| |_|_|/ / |/| | | | | |||
* | | | | | update-index: plug memory leak from prefix_path() | Junio C Hamano | 2006-05-05 |
* | | | | | checkout-index: plug memory leak from prefix_path() | Junio C Hamano | 2006-05-05 |
* | | | | | update-index --unresolve: work from a subdirectory. | Junio C Hamano | 2006-05-05 |
| |/ / / |/| | | | |||
* | | | | pack-object: squelch eye-candy on non-tty | Junio C Hamano | 2006-05-05 |
* | | | | Merge branch 'fix' | Junio C Hamano | 2006-05-05 |
|\ \ \ \ | |/ / / |