summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'stable-3.5' into stable-3.6Matthias Sohn2014-12-1925-141/+533
| |\ \ \ | | |/ / | |/| |
| | * | JGit v3.5.3.201412180710-rv3.5.3.201412180710-rstable-3.5Matthias Sohn2014-12-1855-59/+59
| | * | Merge branch 'stable-3.4' into stable-3.5Matthias Sohn2014-12-1825-141/+533
| | |\ \
| | | * | JGit v3.4.2.201412180340-rv3.4.2.201412180340-rstable-3.4Matthias Sohn2014-12-1855-59/+59
| | | * | ObjectChecker: Disallow names potentially mapping to ".git" on HFS+Matthias Sohn2014-12-182-0/+207
| | | * | ObjectChecker: Disallow Windows shortname "GIT~1"Christian Halstrick2014-12-182-0/+45
| | | * | ObjectChecker: Disallow ".git." and ".git<space>"Shawn Pearce2014-12-183-10/+124
| | | * | Always ignore case when forbidding .git in ObjectCheckerShawn Pearce2014-12-182-22/+5
| | | * | DirCache: Refuse to read files with invalid pathsShawn Pearce2014-12-182-0/+55
| | | * | DirCache: Replace isValidPath with DirCacheCheckout.checkValidPathShawn Pearce2014-12-183-36/+10
| | | * | Replace "a." with "a-" in unit testsShawn Pearce2014-12-188-29/+31
| | | * | Merge changes Icf0970dd,Ice5ec10a into stable-3.4Christian Halstrick2014-11-262-11/+10
| | | |\ \
| | | | * | Fix two nits about DirCacheEntry constructorsShawn Pearce2014-11-251-4/+4
| | | | * | Detect buffering failures while writing rebase todo fileShawn Pearce2014-11-251-7/+6
| | | * | | Apache HttpClientConnection: replace calls to deprecated LocalFile()Matthias Sohn2014-11-261-3/+3
| | | |/ /
| | | * | Deprecate TemporaryBuffer.LocalFile without parent directoryShawn Pearce2014-11-253-14/+21
| | | * | Switch FileHeader.extractFileLines to TemporaryBuffer.HeapShawn Pearce2014-11-252-14/+5
| | | * | AmazonS3: Buffer pushed pack content under $GIT_DIRShawn Pearce2014-11-252-2/+12
| | | * | DirCache: Buffer TREE extension to $GIT_DIRShawn Pearce2014-11-252-11/+16
| * | | | Support the new repository layout for submodulesChristian Halstrick2014-12-153-0/+28
| * | | | Allow explicit configuration of git directory in CloneCommandChristian Halstrick2014-12-152-4/+109
| * | | | Allow explicit configuration of git directory in InitCommandChristian Halstrick2014-12-157-11/+230
| * | | | Merge "Fix tests on windows by closing repos" into stable-3.6Matthias Sohn2014-12-129-258/+274
| |\ \ \ \
| | * | | | Fix tests on windows by closing reposChristian Halstrick2014-12-129-258/+274
| * | | | | Merge "Prevent NPE if ref can't be resolved when executing ReflogCommand" int...Christian Halstrick2014-12-121-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Prevent NPE if ref can't be resolved when executing ReflogCommandMatthias Sohn2014-12-121-0/+4
| * | | | | RepoCommand should close opened reposChristian Halstrick2014-12-121-0/+2
| * | | | | Fix LocalDiskRepositoryTestCase to create correct type of reposChristian Halstrick2014-12-122-1/+6
| |/ / / /
| * | | | Merge "Fix DirCacheCheckout to set correct file length if core.autocrlf=true"...Christian Halstrick2014-12-122-4/+50
| |\ \ \ \
| | * | | | Fix DirCacheCheckout to set correct file length if core.autocrlf=trueMatthias Sohn2014-12-112-4/+50
| * | | | | Merge "CheckoutCommand: Fix checking out ours/theirs when no base stage exist...Christian Halstrick2014-12-122-3/+42
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | CheckoutCommand: Fix checking out ours/theirs when no base stage existsRobin Stocker2014-12-102-3/+42
| | | |_|/ | | |/| |
| * / | | Make sure modifications to config-param trustFolderStat are detectedChristian Halstrick2014-12-051-11/+10
| |/ / /
* | | | Merge "Implement FileSnapshot.toString() to help debugging"Shawn Pearce2014-12-191-1/+17
|\ \ \ \
| * | | | Implement FileSnapshot.toString() to help debuggingMatthias Sohn2014-12-061-1/+17
| |/ / /
* | | | Merge "Revert "Extract path info from requests without decoding""Shawn Pearce2014-12-125-96/+7
|\ \ \ \
| * | | | Revert "Extract path info from requests without decoding"Shawn Pearce2014-12-125-96/+7
* | | | | AWTPlotRenderer: use float arithmetic instead of double followed by a conversionJonathan Nieder2014-12-101-3/+3
* | | | | Merge "Extract path info from requests without decoding"Shawn Pearce2014-12-105-7/+96
|\| | | |
| * | | | Extract path info from requests without decodingDavid Pletcher2014-12-095-7/+96
| |/ / /
* | | | Build with Tycho 0.22.Alexander Kurtakov2014-12-092-3/+3
* | | | Do not use deprecated tasks in maven-antrun-plugin.Alexander Kurtakov2014-12-093-8/+8
|/ / /
* | | Merge "Honor git-core meaning of receive.denyDeletes allowing tag deletion"Matthias Sohn2014-11-291-10/+36
|\ \ \
| * | | Honor git-core meaning of receive.denyDeletes allowing tag deletionShawn Pearce2014-11-291-10/+36
* | | | Move checkPath from DirCacheCheckout to ObjectCheckerShawn Pearce2014-11-284-24/+86
* | | | Use baseline instead of centerline in PlotRendererMichael Keppler2014-11-292-5/+5
* | | | Consider parent rules if ignore rule is negatedAndrey Loskutov2014-11-293-10/+294
* | | | ResolveMerger: Use checkoutEntry during abortShawn Pearce2014-11-271-9/+2
* | | | Cleanup double stat update of symlinks in DirCacheCheckoutShawn Pearce2014-11-271-33/+31
* | | | Deprecate checkoutEntry variant that accepts FileShawn Pearce2014-11-275-49/+46