Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe | Junio C Hamano | 2012-01-27 | 3 | -174/+556 |
|\ | |||||
| * | vcs-svn: avoid hangs from corrupt deltas | Jonathan Nieder | 2011-06-15 | 1 | -3/+37 |
| * | vcs-svn: implement text-delta handling | David Barr | 2011-05-26 | 1 | -2/+106 |
| * | Merge branch 'db/delta-applier' into db/text-delta | Jonathan Nieder | 2011-05-26 | 1 | -0/+248 |
| |\ | |||||
| | * | vcs-svn: let deltas use data from preimage | Jonathan Nieder | 2011-03-28 | 1 | -0/+35 |
| | * | vcs-svn: let deltas use data from postimage | Jonathan Nieder | 2011-03-27 | 1 | -0/+42 |
| | * | vcs-svn: verify that deltas consume all inline data | Jonathan Nieder | 2011-03-27 | 1 | -3/+2 |
| | * | vcs-svn: implement copyfrom_data delta instruction | Jonathan Nieder | 2011-03-27 | 1 | -0/+31 |
| | * | vcs-svn: read instructions from deltas | Jonathan Nieder | 2011-03-27 | 1 | -0/+5 |
| | * | vcs-svn: read inline data from deltas | Jonathan Nieder | 2011-03-27 | 1 | -0/+12 |
| | * | vcs-svn: read the preimage when applying deltas | Jonathan Nieder | 2011-03-27 | 1 | -0/+35 |
| | * | vcs-svn: parse svndiff0 window header | Jonathan Nieder | 2011-03-27 | 1 | -1/+55 |
| | * | vcs-svn: skeleton of an svn delta parser | Jonathan Nieder | 2011-03-27 | 1 | -0/+35 |
| * | | Merge branch 'db/svn-fe-code-purge' into svn-fe | Jonathan Nieder | 2011-05-26 | 1 | -117/+0 |
| |\ \ | |||||
| | * | | vcs-svn: drop obj_pool | David Barr | 2011-03-22 | 1 | -79/+0 |
| | * | | vcs-svn: drop treap | David Barr | 2011-03-22 | 1 | -22/+0 |
| | * | | vcs-svn: drop string_pool | David Barr | 2011-03-22 | 1 | -16/+0 |
| * | | | Merge branch 'db/vcs-svn-incremental' into svn-fe | Jonathan Nieder | 2011-05-26 | 1 | -57/+170 |
| |\ \ \ | | |/ / | |||||
| | * | | vcs-svn: quote paths correctly for ls command | David Barr | 2011-03-07 | 1 | -0/+99 |
| | * | | vcs-svn: set up channel to read fast-import cat-blob response | David Barr | 2011-03-07 | 1 | -51/+67 |
| * | | | Merge commit 'v1.7.5' into svn-fe | Jonathan Nieder | 2011-05-02 | 86 | -347/+2273 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'nd/pathspec-recursion-cleanup' | Junio C Hamano | 2012-01-18 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | diff-index: enable recursive pathspec matching in unpack_treesnd/pathspec-recursion-cleanup | Nguyen Thai Ngoc Duy | 2012-01-16 | 1 | -0/+8 |
* | | | | | | Merge branch 'tr/maint-word-diff-incomplete-line' | Junio C Hamano | 2012-01-18 | 1 | -0/+14 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | word-diff: ignore '\ No newline at eof' markertr/maint-word-diff-incomplete-line | Thomas Rast | 2012-01-12 | 1 | -0/+14 |
* | | | | | | Merge branch 'ss/maint-msys-cvsexportcommit' | Junio C Hamano | 2012-01-12 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9200: On MSYS, do not pass Windows-style paths to CVS | Sebastian Schuberth | 2012-01-11 | 1 | -3/+3 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | t2203: fix wrong commit command | Nguyễn Thái Ngọc Duy | 2012-01-11 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'bw/maint-t8006-sed-incomplete-line' | Junio C Hamano | 2012-01-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use perl instead of sed for t8006-blame-textconv testbw/maint-t8006-sed-incomplete-line | Ben Walton | 2012-01-09 | 1 | -1/+1 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2012-01-10 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge the attributes fix in from maint-1.6.7 branch | Junio C Hamano | 2012-01-10 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 | 1 | -0/+10 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | attr: don't confuse prefixes with leading directories | Jeff King | 2012-01-10 | 1 | -0/+10 |
* | | | | | | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 1 | -0/+80 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 1 | -1/+10 |
| * | | | | | | | | | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 | 1 | -0/+71 |
* | | | | | | | | | | Merge branch 'jm/stash-diff-disambiguate' | Junio C Hamano | 2012-01-06 | 3 | -28/+76 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguate | Jonathon Mah | 2012-01-01 | 3 | -28/+76 |
* | | | | | | | | | | | Merge branch 'jh/fetch-head-update' | Junio C Hamano | 2012-01-06 | 23 | -27/+27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-update | Joey Hess | 2012-01-03 | 23 | -27/+27 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-06 | 1 | -0/+290 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 | 1 | -12/+12 |
| * | | | | | | | | | | | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 | 1 | -1/+1 |
| * | | | | | | | | | | | git-p4: sort client views by reverse View number | Gary Gibbons | 2012-01-03 | 1 | -1/+1 |
| * | | | | | | | | | | | git-p4: fix test for unsupported P4 Client Views | Gary Gibbons | 2012-01-03 | 1 | -2/+2 |
| * | | | | | | | | | | | git-p4: test client view handling | Pete Wyckoff | 2012-01-03 | 1 | -0/+290 |