summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Standardize cast versions of git_object accessorsRussell Belfer2013-04-297-65/+47
| * Make git_oid_cmp public and add git_oid__cmpRussell Belfer2013-04-2917-41/+30
| * Add git_oid_strcmp and use it for git_oid_streqRussell Belfer2013-04-293-14/+63
| * Fix fragile git_oid_ncmpRussell Belfer2013-04-292-2/+23
| * Introduce git_oid_compare, an exported oid cmpRussell Belfer2013-04-292-0/+14
* | Merge pull request #1520 from carlosmn/nth-refspecVicent Martí2013-04-306-10/+78
|\ \
| * | remote: fix a leak when dwim'ing refspecsCarlos Martín Nieto2013-04-301-0/+1
| * | remote: add resfpec list accessorsCarlos Martín Nieto2013-04-305-10/+62
| * | refspec: add direction accessorCarlos Martín Nieto2013-04-302-0/+15
* | | Merge pull request #1522 from arrbee/repo-open-with-no-configVicent Martí2013-04-302-0/+41
|\ \ \ | |/ / |/| |
| * | Catch issue in config set with no config fileRussell Belfer2013-04-302-0/+41
|/ /
* | Merge pull request #1511 from carlosmn/refspec-shorthandVicent Martí2013-04-297-10/+139
|\ \
| * | remote: dwim the refspecs according to the remote's advertised refsCarlos Martín Nieto2013-04-283-9/+127
| * | Parse shorthand refspecs as validCarlos Martín Nieto2013-04-284-1/+12
* | | Merge pull request #1516 from ethomson/win32_alternate_nostatVicent Martí2013-04-291-4/+12
|\ \ \
| * | | don't use uninitialized struct stat in win32Edward Thomson2013-04-291-4/+12
|/ / /
* | | Merge pull request #1513 from ethomson/cmakeVicent Martí2013-04-291-1/+1
|\ \ \ | |_|/ |/| |