summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1550 from nvloff/fix_typo_in_branch_hRussell Belfer2013-05-061-1/+1
|\
| * branch.h: fix typo in docsNikolai Vladimirov2013-05-061-1/+1
|/
* Merge pull request #1549 from nulltoken/fix/from_oidsRussell Belfer2013-05-052-3/+4
|\
| * commit: make create_from_oids() accept plain oidnulltoken2013-05-052-3/+3
| * commit: guard create() against not owned treesnulltoken2013-05-051-0/+1
|/
* odb: Do not error out if an alternate ODB is missingVicent Marti2013-05-031-0/+3
* clar: Always generate the test suiteVicent Marti2013-05-031-1/+1
* Merge pull request #1540 from ethomson/leaksVicent Martí2013-05-035-5/+11
|\
| * fix some leaksEdward Thomson2013-05-025-5/+11
|/
* Merge pull request #1538 from ethomson/merge_warning_cleanupVicent Martí2013-05-021-180/+180
|\
| * bracesEdward Thomson2013-05-021-180/+180
|/
* Merge pull request #1537 from ethomson/merge_warning_cleanupVicent Martí2013-05-023-14/+21
|\
| * puns are not funny; type punning especially soEdward Thomson2013-05-023-14/+21
|/
* Merge pull request #1535 from carlosmn/pack-threadingVicent Martí2013-05-021-16/+15
|\
| * Switch to index_version as "git_pack_file is ready" flagCarlos Martín Nieto2013-05-021-5/+6
| * Revert "Protect sha1_entry_pos call with mutex"Carlos Martín Nieto2013-05-021-12/+10
* | Merge pull request #1531 from libgit2/jk/peeled-refsVicent Martí2013-05-0210-21/+92
|\ \ | |/ |/|
| * refdb_fs: respect PEELING_STANDARDjk/peeled-refsJeff King2013-05-021-1/+3
| * refdb_fs: Only strstr the traits lineVicent Marti2013-05-021-2/+7
| * refdb_fs: Traits are always surrounded by spacesVicent Marti2013-05-022-3/+3
| * refdb_fs: store "cannot be peeled" flag for packed refsVicent Marti2013-05-021-7/+37
| * refdb_fs: implement the fully-peeled traitVicent Marti2013-05-022-8/+1
| * refdb_fs: do not require peeled packed refs to be tagsJeff King2013-05-029-6/+47
|/
* Merge pull request #1529 from arrbee/more-packfile-lockingVicent Martí2013-05-023-38/+108
|\
| * Protect sha1_entry_pos call with mutexRussell Belfer2013-05-021-10/+12
| * Fix some compile warnings and trailing whitespaceRussell Belfer2013-05-021-10/+12
| * Extra threading testsRussell Belfer2013-05-021-3/+55
| * Add extra locking around packfile openRussell Belfer2013-05-021-15/+29
|/
* Merge pull request #1527 from ethomson/checkout_allow_empty_dirsRussell Belfer2013-05-012-2/+31
|\
| * allow empty dirs to exist when doing checkoutEdward Thomson2013-05-012-2/+31
* | refdb: Properly load namespacesVicent Marti2013-05-011-3/+41
|/
* merge: Warning noiseVicent Marti2013-05-015-15/+8
* refdb: Proper namespace rootVicent Marti2013-05-011-1/+1
* Merge pull request #1389 from ethomson/merge_treesVicent Martí2013-05-01427-143/+4714
|\
| * move NAME and REUC extensions to sys/Edward Thomson2013-04-308-156/+186
| * renames!Edward Thomson2013-04-3011-11/+1487
| * merge!Edward Thomson2013-04-30420-34/+3099
* | Merge pull request #1523 from libgit2/vmg/namespacesVicent Martí2013-05-014-2/+50
|\ \ | |/ |/|
| * lol namespacesvmg/namespacesVicent Marti2013-04-304-2/+50
* | Merge pull request #1507 from arrbee/fix-look-inside-untracked-directoryVicent Martí2013-04-3012-230/+575
|\ \ | |/ |/|
| * Fix some formatting inconsistencyRussell Belfer2013-04-302-34/+22
| * Update comment for clarityRussell Belfer2013-04-301-5/+17
| * More tests for diff untracked directoriesRussell Belfer2013-04-303-1/+203
| * Update diff handling of untracked directoriesRussell Belfer2013-04-308-83/+199
| * Reorganize diff code into functionsRussell Belfer2013-04-301-175/+202
|/
* object: hahaVicent Marti2013-04-301-6/+6
* object: Explicitly define helper API methods for all obj typesVicent Marti2013-04-306-34/+133
* Merge pull request #1518 from arrbee/export-oid-comparisonVicent Martí2013-04-3026-120/+199
|\
| * Some cleanupsRussell Belfer2013-04-295-13/+4
| * Add new src/oid.hRussell Belfer2013-04-291-0/+33