Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/parse-date-raw' | Junio C Hamano | 2012-02-10 | 1 | -0/+23 |
|\ | |||||
| * | parse_date(): '@' prefix forces git-timestampjc/parse-date-raw | Junio C Hamano | 2012-02-03 | 1 | -0/+23 |
* | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' | Junio C Hamano | 2012-02-10 | 1 | -0/+13 |
|\ \ | |||||
| * | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-merge | Junio C Hamano | 2012-02-05 | 1 | -0/+13 |
* | | | Merge branch 'jc/branch-desc-typoavoidance' | Junio C Hamano | 2012-02-10 | 1 | -4/+37 |
|\ \ \ | |||||
| * | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidance | Junio C Hamano | 2012-02-05 | 1 | -4/+37 |
* | | | | Merge branch 'jk/tests-write-script' | Junio C Hamano | 2012-02-10 | 2 | -6/+11 |
|\ \ \ \ | |||||
| * | | | | t0300: use write_script helperjk/tests-write-script | Jeff King | 2012-02-03 | 1 | -6/+2 |
| |/ / / | |||||
| * | | | tests: add write_script helper function | Junio C Hamano | 2012-02-03 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'jc/maint-request-pull-for-tag' | Junio C Hamano | 2012-02-07 | 1 | -5/+1 |
|\ \ \ | |||||
| * | | | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tag | Junio C Hamano | 2012-01-31 | 1 | -5/+1 |
* | | | | Merge branch 'jn/svn-fe' | Junio C Hamano | 2012-02-07 | 3 | -174/+556 |
|\ \ \ \ | |||||
| * \ \ \ | 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 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-31 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: use editor by default in interactive sessions | Junio C Hamano | 2012-01-23 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'nd/clone-detached' | Junio C Hamano | 2012-01-31 | 3 | -17/+53 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone: allow --branch to take a tag | Nguyễn Thái Ngọc Duy | 2012-01-16 | 2 | -0/+24 |
| * | | | | | | | | | clone: refuse to clone if --branch points to bogus ref | Nguyễn Thái Ngọc Duy | 2012-01-16 | 2 | -13/+2 |
| * | | | | | | | | | clone: write detached HEAD in bare repositories | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -1/+24 |
| * | | | | | | | | | t5601: add missing && cascade | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'da/maint-mergetool-twoway' | Junio C Hamano | 2012-01-31 | 1 | -1/+27 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | mergetool: Provide an empty file when neededda/maint-mergetool-twoway | David Aguilar | 2012-01-23 | 1 | -1/+27 |
* | | | | | | | | | | | Merge branch 'va/git-p4-branch' | Junio C Hamano | 2012-01-31 | 1 | -7/+87 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t9801: do not overuse test_must_failva/git-p4-branch | Junio C Hamano | 2012-01-26 | 1 | -4/+4 |
| * | | | | | | | | | | | git-p4: Add test case for complex branch import | Vitor Antunes | 2012-01-26 | 1 | -7/+87 |
* | | | | | | | | | | | | Merge branch 'jl/submodule-re-add' | Junio C Hamano | 2012-01-31 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-add | Jens Lehmann | 2012-01-24 | 1 | -0/+8 |
* | | | | | | | | | | | | | Merge branch 'tr/grep-l-with-decoration' | Junio C Hamano | 2012-01-31 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decoration | Albert Yale | 2012-01-23 | 1 | -0/+22 |
* | | | | | | | | | | | | | | Merge branch 'ks/sort-wildcard-in-makefile' | Junio C Hamano | 2012-01-31 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |