Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'stable-6.0' into stable-6.1 | Matthias Sohn | 2022-05-27 | 2 | -9/+27 | |
| |\| | | | | | | ||||||
| | * | | | | | | Merge branch 'stable-5.13' into stable-6.0 | Matthias Sohn | 2022-05-27 | 2 | -9/+27 | |
| | |\| | | | | | ||||||
| | | * | | | | | Remove stray files (probes or lock files) created by background threads | James Z.M. Gao | 2022-05-27 | 2 | -9/+27 | |
* | | | | | | | | Teach JGit to handle external diff/merge tools defined in .gitattributes | Andre Bossert | 2022-06-02 | 4 | -8/+186 | |
* | | | | | | | | Adapt diff- and merge tool code for PGM and EGit usage | Andre Bossert | 2022-06-02 | 7 | -222/+546 | |
* | | | | | | | | Add availability check of pre-defined tools | Andre Bossert | 2022-06-01 | 10 | -26/+207 | |
* | | | | | | | | Merge "Add filtering with help of DirCacheCheckout.getContent()" | Andrey Loskutov | 2022-05-30 | 5 | -134/+282 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add filtering with help of DirCacheCheckout.getContent() | Andre Bossert | 2022-05-30 | 5 | -134/+282 | |
* | | | | | | | | | Fixed since tags added for new merge constants | Andrey Loskutov | 2022-05-30 | 1 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge "Add mergetool merge feature (execute external tool)" | Andrey Loskutov | 2022-05-27 | 4 | -65/+178 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add mergetool merge feature (execute external tool) | Andre Bossert | 2022-05-25 | 4 | -65/+178 | |
* | | | | | | | | | Merge "Add command line support for "git mergetool"" | Andrey Loskutov | 2022-05-27 | 8 | -52/+573 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Add command line support for "git mergetool" | Andre Bossert | 2022-05-25 | 8 | -52/+573 | |
* | | | | | | | | | Merge "Add config reader for user-defined mergetools" | Andrey Loskutov | 2022-05-27 | 5 | -4/+374 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Add config reader for user-defined mergetools | Andre Bossert | 2022-05-25 | 5 | -4/+374 | |
* | | | | | | | | | Merge "Add difftool compare feature (execute external tool)" | Andrey Loskutov | 2022-05-27 | 7 | -40/+624 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Add difftool compare feature (execute external tool) | Andre Bossert | 2022-05-25 | 7 | -40/+624 | |
* | | | | | | | | | RewriteGenerator: Fully buffering of input is no longer necessary | Simon Sohrt | 2022-05-25 | 4 | -22/+68 | |
|/ / / / / / / / | ||||||
* | | | | | | | | PackFileSnapshot: Resolve warnings by using "equals" instead of "==" | Fabio Ponciroli | 2022-05-20 | 2 | -1/+39 | |
* | | | | | | | | Remove stray files (probes or lock files) created by background threads | James Z.M. Gao | 2022-05-15 | 2 | -9/+27 | |
* | | | | | | | | RefSpec: add missing @since | Thomas Wolf | 2022-04-25 | 1 | -0/+1 | |
* | | | | | | | | De-couple ServiceLoader calls from class loading | Thomas Wolf | 2022-04-14 | 2 | -28/+65 | |
* | | | | | | | | CommitCommand: call GpgSigner.getDefault() only if indeed signing | Thomas Wolf | 2022-04-14 | 1 | -8/+8 | |
* | | | | | | | | GpgSigner: prevent class lock inversion on the default signer | Thomas Wolf | 2022-04-14 | 1 | -14/+30 | |
* | | | | | | | | Fetch: Introduce negative refspecs. | yunjieli | 2022-04-13 | 4 | -8/+115 | |
* | | | | | | | | BaseSearch: Suppress ReferenceEquality Warnings | Fabio Ponciroli | 2022-04-02 | 1 | -0/+1 | |
* | | | | | | | | RewriteGenerator: Suppress ReferenceEquality Warnings | Fabio Ponciroli | 2022-04-01 | 1 | -0/+1 | |
* | | | | | | | | PlotCommit: Suppress ReferenceEquality Warnings | Fabio Ponciroli | 2022-04-01 | 1 | -0/+1 | |
* | | | | | | | | PlotCommitList: Suppress ReferenceEquality Warnings | Fabio Ponciroli | 2022-04-01 | 1 | -0/+4 | |
* | | | | | | | | Use git config core.commentChar | Thomas Wolf | 2022-03-26 | 5 | -34/+94 | |
* | | | | | | | | CommitConfig: add support for core.commentChar | Thomas Wolf | 2022-03-26 | 2 | -2/+111 | |
* | | | | | | | | [push, lfs] Tell the pre-push hook whether the push is a dry run | Thomas Wolf | 2022-03-23 | 2 | -2/+26 | |
* | | | | | | | | Merge changes I5df54a92,Iecc61d1c | Matthias Sohn | 2022-03-22 | 3 | -52/+138 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | LsRemoteCommand: apply url.*.insteadOf | Thomas Wolf | 2022-03-15 | 1 | -6/+14 | |
| * | | | | | | | | Factor out URL replacement from RemoteConfig | Thomas Wolf | 2022-03-15 | 2 | -46/+124 | |
| |/ / / / / / / | ||||||
* | | | | | | | | DirCacheCheckout: use a LinkedHashMap instead of HashMap | Thomas Wolf | 2022-03-19 | 1 | -2/+2 | |
* | | | | | | | | Re-try reading a file when there are concurrent writes | Thomas Wolf | 2022-03-19 | 3 | -107/+168 | |
* | | | | | | | | [sideband] Ensure last bit of progress channel is written | Thomas Wolf | 2022-03-19 | 3 | -7/+39 | |
|/ / / / / / / | ||||||
* | | | | | | | [checkout] Use .gitattributes from the commit to be checked out | Thomas Wolf | 2022-03-07 | 4 | -143/+304 | |
* | | | | | | | Don't use final for method parameters | Matthias Sohn | 2022-03-06 | 3 | -20/+14 | |
* | | | | | | | [push] support the "matching" RefSpecs ":" and "+:" | Thomas Wolf | 2022-03-06 | 5 | -64/+280 | |
* | | | | | | | [push] Call the pre-push hook later in the push process | Thomas Wolf | 2022-03-06 | 2 | -15/+43 | |
* | | | | | | | IndexDiff: use tree filter also for SubmoduleWalk | Thomas Wolf | 2022-03-06 | 1 | -0/+3 | |
* | | | | | | | Describe: add support for core.abbrev config option | Matthias Sohn | 2022-03-02 | 9 | -12/+268 | |
* | | | | | | | Add a typed config getter for integers confined to a range | Matthias Sohn | 2022-03-02 | 3 | -0/+55 | |
* | | | | | | | PersonIdent: Add ctors that accept Instant in addition to Date | David Ostrovsky | 2022-03-02 | 1 | -0/+57 | |
* | | | | | | | Make precedence more explicit | Fabio Ponciroli | 2022-03-02 | 1 | -1/+1 | |
* | | | | | | | Cap describe abbrev option | Matthias Sohn | 2022-03-02 | 1 | -2/+10 | |
* | | | | | | | DescribeCommand: Add support for --abbrev=0 | Matthias Sohn | 2022-03-02 | 1 | -0/+3 | |
* | | | | | | | DescribeCommand: Support configuring the hash abbreviation | Sebastian Schuberth | 2022-02-19 | 1 | -5/+26 |