summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | pack-objects: free memory safelyCarlos Martín Nieto2014-03-041-10/+17
* | | | Merge pull request #2155 from jacquesg/stash-save-remove-ignoredRussell Belfer2014-03-042-2/+9
|\ \ \ \
| * | | | Remove ignored files from the working directory if they were stashedJacques Germishuys2014-03-042-2/+9
|/ / / /
* | | | Merge pull request #2148 from fourplusone/patch-1Vicent Marti2014-03-031-0/+15
|\ \ \ \
| * | | | Added a test, that fails for #2133Matthias Bartelmeß2014-03-031-0/+15
|/ / / /
* | | | Merge pull request #2141 from ravselj/developmentVicent Marti2014-03-039-7/+19
|\ \ \ \ | |/ / / |/| | |
| * | | - examples CMakeLists.txt reverted to previous stateMiha Ravšelj2014-03-031-5/+1
| * | | cmake examples change so that general.c is off by defaultMiha2014-03-032-2/+6
| * | | - CMakeLists.txt small fixMiha2014-03-031-2/+1
| * | | - general.c reverted to original( before pr state )Miha2014-03-031-39/+43
| * | | Merge remote-tracking branch 'remotes/upstream/development' into developmentMiha2014-03-0317-356/+462
| |\ \ \
| * | | | - need_pack was not set to 0 when local fetch was already present causing ne...Miha2014-02-251-1/+3
| * | | | - BUGFIX #2133 (@fourplusone) in smart_protocol.cMiha2014-02-259-50/+57
* | | | | Merge pull request #2151 from arthurschreiber/patch-3Vicent Marti2014-03-031-1/+1
|\ \ \ \ \
| * | | | | Fix the description for `GIT_FEATURE_SSH`.Arthur Schreiber2014-03-031-1/+1
|/ / / / /
* | | | | Merge pull request #2150 from libgit2/vmg/featuresVicent Marti2014-03-033-21/+26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | features: Rename `_HAS_` to `_FEATURE_`vmg/featuresVicent Marti2014-03-033-16/+16
| * | | | caps: Rename the enum name too!Vicent Marti2014-03-031-1/+1
| * | | | caps: Rename to features to avoid confusionVicent Marti2014-03-033-20/+25
|/ / / /
* | | | Merge pull request #2144 from linquize/branch-f-currentBen Straub2014-03-022-0/+32
|\ \ \ \
| * | | | Add unit test to show git_branch_create() fails if attempt to force create cu...Linquize2014-03-021-0/+19
| * | | | Do not allow git_branch_create() to force update branchLinquize2014-02-271-0/+13
* | | | | Merge pull request #2143 from libgit2/rb/projectsVicent Marti2014-03-013-31/+103
|\ \ \ \ \
| * | | | | Add project list and update readmeRussell Belfer2014-02-263-31/+103
| | |/ / / | |/| | |
* | | | | Merge pull request #2146 from libgit2/rb/diff-b2bVicent Marti2014-02-287-318/+300
|\ \ \ \ \
| * | | | | Add buffer to buffer diff and patch APIsRussell Belfer2014-02-276-311/+289
| * | | | | Fix warnings and code style issuesRussell Belfer2014-02-271-7/+11
|/ / / / /
* | | | | Merge pull request #2137 from jru/blame-first-parentBen Straub2014-02-264-2/+27
|\ \ \ \ \
| * | | | | Reset num_parents to 1 only for merge commitsJuan Rubén2014-02-262-2/+2
| * | | | | Document enumerator and rewordingJuan Rubén2014-02-242-2/+3
| * | | | | Add unit testJuan Rubén2014-02-241-0/+15
| * | | | | Add option to limit blame to first parentJuan Rubén2014-02-233-2/+11
* | | | | | Merge pull request #2142 from ethomson/ignore_authorsVicent Marti2014-02-261-5/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove "ignore" state from the git.git-authorsEdward Thomson2014-02-261-5/+0
|/ / / / /
* | | | | Merge pull request #2138 from ethomson/sysdirVicent Marti2014-02-2513-355/+396
|\ \ \ \ \
| * | | | | Move system directory cache out of utilsEdward Thomson2014-02-2413-355/+396
* | | | | | Merge pull request #2139 from ethomson/va_copy_warningVicent Marti2014-02-2511-16/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove now-duplicated stdarg.h includeEdward Thomson2014-02-2410-16/+0
| * | | | | Include stdarg.h for the va_copy testEdward Thomson2014-02-241-0/+2
|/ / / / /
* | | | | Merge pull request #2134 from libgit2/ben/iccVicent Marti2014-02-244-6/+8
|\ \ \ \ \
| * | | | | Use a portable castBen Straub2014-02-241-2/+2
| * | | | | Prevent icc warningBen Straub2014-02-241-1/+3
| * | | | | Avoid casting warningBen Straub2014-02-241-2/+2
| * | | | | Staticize file-local variablesBen Straub2014-02-242-3/+3
|/ / / / /
* | | | | Merge pull request #2132 from ethomson/merge_docVicent Marti2014-02-241-33/+127
|\ \ \ \ \
| * | | | | Improve documentation for mergingEdward Thomson2014-02-211-33/+127
* | | | | | Merge pull request #2130 from worblehat/developmentRussell Belfer2014-02-211-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Check if librt exists independent of OS, to be able to exclude librt on Andro...Tobias Marquardt2014-02-211-1/+5
* | | | | | Merge pull request #2129 from arrbee/rb/c89-or-c99Vicent Marti2014-02-2114-53/+71
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Address PR commentsRussell Belfer2014-02-2010-29/+30