aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* plumbing: packfile, apply small object reading optimization also for delta ob...Filip Navara2019-04-201-23/+61
* plumbing: commit.StatsContext and fix for orphan commit (#1115)v4.11.0Máximo Cuadros2019-04-182-15/+40
* Merge pull request #1088 from oleksii-shnyra/fix-1074Máximo Cuadros2019-04-182-2/+87
|\
| * plumbing: commit.Stat test suiteMáximo Cuadros2019-04-181-0/+78
| * plumbing: object, Count stats properly when no new line added at the end. Fix...oleksiishnyra2019-03-141-2/+9
* | Merge pull request #1112 from HashedDan/commit-example-typoMáximo Cuadros2019-04-181-1/+1
|\ \
| * | examples: commit, fixed minor typo in info statementHashedDan2019-04-151-1/+1
|/ /
* | Merge pull request #1095 from niukuo/panic_find_entryMáximo Cuadros2019-04-022-1/+4
|\ \
| * | fix panic in object.Tree.FindEntryniukuo2019-03-272-1/+4
* | | Merge pull request #1099 from dpordomingo/go1.12-supportMáximo Cuadros2019-04-021-1/+1
|\ \ \ | |/ / |/| |
| * | travis: drop go1.10 add go1.12David Pordomingo2019-03-291-1/+1
|/ /
* | Merge pull request #1092 from niukuo/masterMáximo Cuadros2019-03-251-1/+1
|\ \
| * | fix missing error in bfsCommitIteratorniukuo2019-03-211-1/+1
* | | Merge pull request #1094 from niukuo/remote_anonymousMáximo Cuadros2019-03-252-0/+47
|\ \ \
| * | | add Repository.CreateRemoteAnonymousniukuo2019-03-222-0/+47
| |/ /
* | | Merge pull request #1093 from jfontan/transactional-packfilewriter-interfaceMáximo Cuadros2019-03-222-9/+67
|\ \ \ | |/ / |/| |
| * | transactional: implement storer.PackfileWriterJavi Fontan2019-03-212-9/+67
| |/
* | Merge pull request #1084 from vmarkovtsev/masterMáximo Cuadros2019-03-201-1/+17
|\ \ | |/ |/|
| * Add diff.DoWithTimeout()Vadim Markovtsev2019-03-131-2/+16
| * Increase diffmatchcpatch timeoutVadim Markovtsev2019-03-101-0/+2
* | Merge pull request #1081 from meinto/fix/tobias/potentially-duplicate-check-f...Máximo Cuadros2019-03-111-11/+0
|\ \ | |/ |/|
| * git: remove potentially duplicate check for unstaged filesTobias Meinhardt2019-03-051-11/+0
|/
* Merge pull request #1072 from jeremyschlatter/patch-3Máximo Cuadros2019-03-041-1/+1
|\
| * git: Fix typoJeremy Schlatter2019-02-221-1/+1
* | Merge pull request #1073 from jeremyschlatter/patch-2Máximo Cuadros2019-03-041-1/+1
|\ \
| * | git: Fix typoJeremy Schlatter2019-02-221-1/+1
| |/
* | Merge pull request #1070 from fbsb/fix/enable-excluded-patternsMáximo Cuadros2019-03-042-1/+33
|\ \
| * | worktree: test hardcoded excludes when no gitignore is presentFabian Sabau2019-03-041-0/+28
| * | worktree: enable manual ignore patterns when no .gitignore is availableFabian Sabau2019-03-041-1/+5
|/ /
* | Merge pull request #1080 from jfontan/fix/blocked-goroutine-remote-pushMáximo Cuadros2019-03-042-1/+17
|\ \
| * | git: fix goroutine block while pushing a remoteJavi Fontan2019-03-012-1/+17
|/ /
* | Merge pull request #1076 from jfontan/panic-cacheMáximo Cuadros2019-02-262-1/+19
|\ \ | |/ |/|
| * plumbing/cache: check for empty cache listJavi Fontan2019-02-252-1/+19
|/
* Merge pull request #1065 from vmarkovtsev/fix-unicodev4.10.0Máximo Cuadros2019-02-144-14/+62
|\
| * Remove Unicode normalization in difftreeVadim Markovtsev2019-02-114-14/+62
* | Merge pull request #1067 from ajnavarro/fix/log-all-missing-objectsMáximo Cuadros2019-02-132-11/+85
|\ \
| * | Improve error handling logicAntonio Jesus Navarro Perez2019-02-131-4/+4
| * | Ignore missing references on log --allAntonio Jesus Navarro Perez2019-02-122-11/+85
* | | Merge pull request #1066 from keybase/strib/909-git-push-speedup-when-localJeremy Stribling2019-02-136-17/+104
|\ \ \
| * | | remote: when pushing to a local repo, use local store for ignoresJeremy Stribling2019-02-111-1/+14
| * | | config: add a way to see if a "remote" URL is local or notJeremy Stribling2019-02-113-14/+50
| * | | revlist: add `ObjectsWithStorageForIgnores` methodJeremy Stribling2019-02-112-2/+40
|/ / /
* | | Merge pull request #1064 from asv/sentinel_error_for_no_ff_updateMáximo Cuadros2019-02-082-6/+7
|\ \ \
| * | | worktree: add sentinel error for non-fast-forward pullAlexey Smirnov2019-02-072-6/+7
|/ / /
* | | Merge pull request #1060 from keybase/strib/gh-KBFS-3828-packfile-object-sizeMáximo Cuadros2019-02-052-1/+27
|\ \ \
| * | | packfile: get object size correctly for delta objectsJeremy Stribling2019-01-312-1/+27
| |/ /
* | | Merge pull request #1006 from mcuadros/transactional-storageMáximo Cuadros2019-02-0220-8/+1161
|\ \ \ | |/ / |/| |
| * | storage: transactional, package documentationMáximo Cuadros2019-02-028-21/+75
| * | storage: transactional, new storage with transactional capabilitiesMáximo Cuadros2018-12-1014-7/+675
| * | storage: new storage.ErrReferenceHasChanged error and test for CheckAndSetRef...Máximo Cuadros2018-12-104-3/+58