Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | RepoCommand: Do not set 'branch' if the revision is a tag | Ivan Frade | 2021-05-26 | 1 | -2/+6 |
* | Merge "Add git config for conflict style merge/diff3" | Matthias Sohn | 2021-05-26 | 2 | -0/+22 |
|\ | |||||
| * | Add git config for conflict style merge/diff3 | Thomas Wolf | 2021-05-03 | 2 | -0/+22 |
* | | ApplyCommand: fix "no newline at end" detection | Thomas Wolf | 2021-05-26 | 1 | -1/+5 |
* | | ApplyCommand: handle completely empty context lines in text patches | Thomas Wolf | 2021-05-26 | 1 | -2/+14 |
* | | ApplyCommand: use byte arrays for text patches, not strings | Thomas Wolf | 2021-05-26 | 2 | -39/+55 |
* | | ApplyCommand: support binary patches | Thomas Wolf | 2021-05-26 | 2 | -30/+247 |
* | | ApplyCommand: add a stream to apply a delta patch | Thomas Wolf | 2021-05-26 | 2 | -0/+209 |
* | | ApplyCommand: add streams to read/write binary patch hunks | Thomas Wolf | 2021-05-26 | 3 | -0/+233 |
* | | ApplyCommand: add a base-85 codec | Thomas Wolf | 2021-05-26 | 2 | -0/+200 |
* | | ApplyCommand: convert to git internal format before applying patch | Thomas Wolf | 2021-05-18 | 1 | -24/+255 |
* | | SSH config: fix whitespace handling | Thomas Wolf | 2021-05-17 | 1 | -5/+8 |
* | | SSH config: fix negated patterns | Thomas Wolf | 2021-05-17 | 1 | -58/+50 |
* | | Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMS | Matthias Sohn | 2021-05-14 | 1 | -1/+1 |
* | | Merge branch 'stable-5.12' | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
|\ \ | |||||
| * \ | Merge branch 'stable-5.11' into stable-5.12 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| |\ \ | |||||
| | * \ | Merge branch 'stable-5.10' into stable-5.11 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| | |\ \ | |||||
| | | * \ | Merge branch 'stable-5.9' into stable-5.10 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'stable-5.8' into stable-5.9 | Matthias Sohn | 2021-05-12 | 1 | -14/+13 |
| | | | |\ \ | |||||
| | | | | * \ | Merge branch 'stable-5.7' into stable-5.8 | Matthias Sohn | 2021-05-11 | 2 | -18/+13 |
| | | | | |\ \ | |||||
| | | | | | * \ | Merge branch 'stable-5.6' into stable-5.7 | Matthias Sohn | 2021-05-11 | 2 | -18/+13 |
| | | | | | |\ \ | |||||
| | | | | | | * | | Remove texts which were added by mistake in 00386272 | Matthias Sohn | 2021-05-11 | 1 | -4/+0 |
| | | | | | | * | | Fix formatting which was broken in 00386272 | Matthias Sohn | 2021-05-11 | 1 | -14/+13 |
* | | | | | | | | | Merge branch 'stable-5.12' | Matthias Sohn | 2021-05-11 | 2 | -49/+12 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'stable-5.11' into stable-5.12 | Matthias Sohn | 2021-05-11 | 3 | -70/+92 |
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Merge branch 'stable-5.10' into stable-5.11 | Matthias Sohn | 2021-05-11 | 3 | -70/+92 |
| | |\| | | | | | |||||
| | | * | | | | | Merge branch 'stable-5.9' into stable-5.10 | Matthias Sohn | 2021-05-11 | 3 | -71/+93 |
| | | |\| | | | | |||||
| | | | * | | | | Merge branch 'stable-5.8' into stable-5.9 | Matthias Sohn | 2021-05-11 | 3 | -71/+93 |
| | | | |\| | | | |||||
| | | | | * | | | Merge branch 'stable-5.7' into stable-5.8 | Matthias Sohn | 2021-05-11 | 3 | -71/+97 |
| | | | | |\| | | |||||
| | | | | | * | | Merge branch 'stable-5.6' into stable-5.7 | Matthias Sohn | 2021-05-11 | 2 | -34/+97 |
| | | | | | |\| | |||||
| | | | | | | * | LockFile: create OutputStream only when needed | Thomas Wolf | 2021-05-10 | 2 | -108/+105 |
| | | | | | * | | Remove ReftableNumbersNotIncreasingException | Han-Wen Nienhuys | 2021-03-01 | 1 | -37/+0 |
* | | | | | | | | Add TemporaryBuffer.toString(int limit) | Matthias Sohn | 2021-05-09 | 3 | -6/+22 |
* | | | | | | | | LockFile: create OutputStream only when needed | Thomas Wolf | 2021-05-07 | 2 | -43/+102 |
|/ / / / / / / | |||||
* | | | | | | | Implement ours/theirs content conflict resolution | Thomas Wolf | 2021-04-19 | 8 | -100/+400 |
* | | | | | | | Allow file mode conflicts in virtual base commit on recursive merge. | Marija Savtchouk | 2021-04-06 | 1 | -9/+12 |
* | | | | | | | Allow info messages in UsernamePasswordCredentialsProvider | Thomas Wolf | 2021-04-01 | 1 | -7/+17 |
* | | | | | | | ssh config: do environment variable replacement | Thomas Wolf | 2021-04-01 | 1 | -29/+56 |
* | | | | | | | Merge branch 'stable-5.11' | Matthias Sohn | 2021-03-26 | 4 | -101/+166 |
|\| | | | | | | |||||
| * | | | | | | Refactor CommitCommand to improve readability | Matthias Sohn | 2021-03-23 | 1 | -72/+90 |
| * | | | | | | CommitCommand: fix formatting | Matthias Sohn | 2021-03-23 | 1 | -2/+1 |
| * | | | | | | CommitCommand: remove unncessary comment | Matthias Sohn | 2021-03-23 | 1 | -1/+0 |
| * | | | | | | Ensure post-commit hook is called after index lock was released | Matthias Sohn | 2021-03-23 | 2 | -6/+18 |
| * | | | | | | sshd: modernize ssh config file parsing | Thomas Wolf | 2021-03-19 | 1 | -22/+51 |
| * | | | | | | sshd: implement ssh config PubkeyAcceptedAlgorithms | Thomas Wolf | 2021-03-19 | 1 | -0/+8 |
* | | | | | | | Optimize RevWalkUtils.findBranchesReachableFrom() | Adithya Chakilam | 2021-03-14 | 2 | -10/+41 |
* | | | | | | | Introduce getMergedInto(RevCommit commit, Collection<Ref> refs) | Adithya Chakilam | 2021-03-14 | 1 | -0/+114 |
* | | | | | | | Skip detecting content renames for large files | Youssef Elghareeb | 2021-03-14 | 2 | -0/+44 |
* | | | | | | | HTTP cookies: do tilde expansion on http.cookieFile | Thomas Wolf | 2021-03-12 | 2 | -8/+20 |
|/ / / / / / | |||||
* | | | | | | PackFile: Add id + ext based constructors | Nasser Grainawi | 2021-03-07 | 6 | -34/+70 |