summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lolXcode.fix-submodule-config-loadingAlan Rogers2013-06-281-1/+1
* tabs.Alan Rogers2013-06-281-2/+2
* We DO still need load the config from the index apparently.Alan Rogers2013-06-281-1/+2
* Don't bail out after failing to read submodule configs.Alan Rogers2013-06-281-4/+2
* Merge pull request #1684 from libgit2/fix-dirty-submodule-diffRussell Belfer2013-06-272-2/+8
|\
| * Fix bug marking submodule diffs as unmodifiedRussell Belfer2013-06-272-2/+8
| * Fail on unmodified deltas when they're unexpectedJustin Spahr-Summers2013-06-261-1/+1
|/
* Merge pull request #1681 from arthurschreiber/patch-1Russell Belfer2013-06-252-1/+13
|\
| * Add a test case.Arthur Schreiber2013-06-251-0/+12
| * Prefer younger merge bases over older ones.Arthur Schreiber2013-06-251-1/+1
* | Merge pull request #1678 from arthurschreiber/unbreak-local-ls-after-disconnectRussell Belfer2013-06-252-12/+34
|\ \
| * | Make sure we don't leak memory again.Arthur Schreiber2013-06-251-0/+7
| * | Unbreak git_remote_ls on a local transport after disconnecting.Arthur Schreiber2013-06-252-12/+27
| |/
* | Merge pull request #1680 from csware/win32-junctionRussell Belfer2013-06-252-2/+4
|\ \ | |/ |/|
| * Correctly handle junctionsSven Strickroth2013-06-251-0/+3
| * Revert "Work around reparse point stat issues"Sven Strickroth2013-06-251-2/+1
|/
* libgit2 v0.19.0 "gut merge"v0.19.0Vicent Marti2013-06-251-2/+2
* test-rename: This is not a decimal, sillyVicent Marti2013-06-251-2/+2
* Merge pull request #1675 from arthurschreiber/fix-leak-in-local-transportRussell Belfer2013-06-241-9/+9
|\
| * Fix a leak in the local transport code.Arthur Schreiber2013-06-241-9/+9
* | Merge pull request #1674 from arrbee/fix-checkout-target-dir-win32Vicent Martí2013-06-242-6/+14
|\ \ | |/ |/|
| * Fix checkout tests on WindowsRussell Belfer2013-06-242-6/+14
|/
* Merge pull request #1672 from TheRealKerni/fix/header_docsVicent Martí2013-06-2417-35/+35
|\
| * Fixed most documentation header bugsAndreas Linde2013-06-2417-35/+35
* | Merge pull request #1670 from arrbee/open-cloexecVicent Martí2013-06-243-4/+9
|\ \
| * | Add O_CLOEXEC to open callsRussell Belfer2013-06-223-4/+9
| |/
* | Merge pull request #1669 from arrbee/fix-index-add-bypathVicent Martí2013-06-242-17/+32
|\ \ | |/ |/|
| * Work around reparse point stat issuesRussell Belfer2013-06-241-1/+2
| * Constrain mkdir calls to avoid extra mkdirsRussell Belfer2013-06-221-16/+30
* | Merge pull request #1668 from csware/WC_ERR_INVALID_CHARSRussell Belfer2013-06-221-0/+2
|\ \ | |/ |/|
| * Do not redefine WC_ERR_INVALID_CHARSSven Strickroth2013-06-231-0/+2
|/
* Merge pull request #1665 from arrbee/checkout-target-directoryVicent Martí2013-06-216-19/+211
|\
| * Addition checkout target directory testsRussell Belfer2013-06-212-0/+115
| * Loosen ensure_not_bare rules in checkoutRussell Belfer2013-06-211-6/+27
| * Add target directory to checkoutRussell Belfer2013-06-215-13/+69
|/
* Merge pull request #1664 from arrbee/checkout-deleted-with-fixVicent Martí2013-06-215-1/+158
|\
| * Fix checkout of modified file when missing from wdRussell Belfer2013-06-215-1/+128
| * test asserting checkout should not recreate deleted filesEdward Thomson2013-06-201-0/+30
|/
* Merge pull request #1662 from arrbee/examples-like-gitVicent Martí2013-06-2013-20/+597
|\
| * Add test for fixed diff bugRussell Belfer2013-06-201-0/+20
| * Fix comment and copyright in exampleRussell Belfer2013-06-201-6/+11
| * Add example implementation of long format statusRussell Belfer2013-06-201-2/+145
| * Add status flags to force output sort orderRussell Belfer2013-06-2011-16/+126
| * Initial implementation of status exampleRussell Belfer2013-06-202-1/+295
| * Fix bug in diff untracked dir scanRussell Belfer2013-06-201-4/+9
|/
* Merge pull request #1661 from arrbee/index-add-allVicent Martí2013-06-198-4/+718
|\
| * Add tests and fix use of freed memoryRussell Belfer2013-06-192-3/+29
| * Add index pathspec-based operationsRussell Belfer2013-06-194-4/+586
| * Add fn to check pathspec for ignored filesRussell Belfer2013-06-192-0/+67
| * Add higher level pathspec APIRussell Belfer2013-06-192-0/+39