diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-04 17:30:31 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-04 17:30:31 +0200 |
| commit | 6fbb69306c0e14bacb8dcb92a89af27d3d5d631f (patch) | |
| tree | 4a6e0c14b412315c13cc4ac6466f4888644195a3 /test/fixtures/rev_list | |
| parent | 25dca42bac17d511b7e2ebdd9d1d679e7626db5f (diff) | |
| parent | e746f96bcc29238b79118123028ca170adc4ff0f (diff) | |
| download | GitPython-6fbb69306c0e14bacb8dcb92a89af27d3d5d631f.tar.gz GitPython-6fbb69306c0e14bacb8dcb92a89af27d3d5d631f.zip | |
Merge branch 'odb'
Conflicts:
lib/git/cmd.py
Diffstat (limited to 'test/fixtures/rev_list')
| -rw-r--r-- | test/fixtures/rev_list | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/test/fixtures/rev_list b/test/fixtures/rev_list index 95a1ebff..1a576118 100644 --- a/test/fixtures/rev_list +++ b/test/fixtures/rev_list @@ -1,24 +1,3 @@ -commit 4c8124ffcf4039d292442eeccabdeca5af5c5017 -tree 672eca9b7f9e09c22dcb128c283e8c3c8d7697a4 -parent 634396b2f541a9f2d58b00be1a07f0c358b999b3 -author Tom Preston-Werner <tom@mojombo.com> 1191999972 -0700 -committer Tom Preston-Werner <tom@mojombo.com> 1191999972 -0700 - - implement Grit#heads - -commit 634396b2f541a9f2d58b00be1a07f0c358b999b3 -tree b35b4bf642d667fdd613eebcfe4e17efd420fb8a -author Tom Preston-Werner <tom@mojombo.com> 1191997100 -0700 -committer Tom Preston-Werner <tom@mojombo.com> 1191997100 -0700 - - initial grit setup - -commit ab25fd8483882c3bda8a458ad2965d2248654335 -tree c20b5ec543bde1e43a931449b196052c06ed8acc -parent 6e64c55896aabb9a7d8e9f8f296f426d21a78c2c -parent 7f874954efb9ba35210445be456c74e037ba6af2 -author Tom Preston-Werner <tom@mojombo.com> 1182645538 -0700 -committer Tom Preston-Werner <tom@mojombo.com> 1182645538 -0700 - - Merge branch 'site' - Some other stuff +4c8124ffcf4039d292442eeccabdeca5af5c5017 +634396b2f541a9f2d58b00be1a07f0c358b999b3 +ab25fd8483882c3bda8a458ad2965d2248654335 |