Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ma/lockfile-fixes' | Junio C Hamano | 2017-11-06 | 21 | -131/+123 |
|\ | |||||
| * | read_cache: roll back lock in `update_index_if_able()` | Martin Ågren | 2017-10-07 | 2 | -3/+6 |
| * | read-cache: leave lock in right state in `write_locked_index()` | Martin Ågren | 2017-10-07 | 5 | -11/+13 |
| * | read-cache: drop explicit `CLOSE_LOCK`-flag | Martin Ågren | 2017-10-07 | 3 | -14/+15 |
| * | cache.h: document `write_locked_index()` | Martin Ågren | 2017-10-06 | 1 | -0/+16 |
| * | apply: remove `newfd` from `struct apply_state` | Martin Ågren | 2017-10-06 | 2 | -13/+7 |
| * | apply: move lockfile into `apply_state` | Martin Ågren | 2017-10-06 | 4 | -17/+9 |
| * | cache-tree: simplify locking logic | Martin Ågren | 2017-10-06 | 1 | -8/+4 |
| * | checkout-index: simplify locking logic | Martin Ågren | 2017-10-06 | 1 | -5/+3 |
| * | tempfile: fix documentation on `delete_tempfile()` | Martin Ågren | 2017-10-06 | 1 | -4/+4 |
| * | lockfile: fix documentation on `close_lock_file_gently()` | Martin Ågren | 2017-10-06 | 1 | -2/+2 |
| * | treewide: prefer lockfiles on the stack | Martin Ågren | 2017-10-06 | 8 | -49/+42 |
| * | sha1_file: do not leak `lock_file` | Martin Ågren | 2017-10-06 | 1 | -11/+8 |
* | | Git 2.15v2.15.0 | Junio C Hamano | 2017-10-30 | 1 | -1/+1 |
* | | Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-po | Junio C Hamano | 2017-10-30 | 1 | -58/+123 |
|\ \ | |||||
| * | | l10n: Update Catalan translation | Jordi Mas | 2017-10-29 | 1 | -58/+123 |
* | | | Hopefully final batch before 2.15 | Junio C Hamano | 2017-10-28 | 1 | -0/+7 |
* | | | Merge branch 'sg/rev-list-doc-reorder-fix' | Junio C Hamano | 2017-10-28 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | rev-list-options.txt: use correct directional reference | SZEDER Gábor | 2017-10-27 | 1 | -3/+3 |
* | | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-10-28 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | docs: fix formatting of rev-parse's --show-superproject-working-tree | Sebastian Schuberth | 2017-10-27 | 1 | -1/+1 |
* | | | | | Merge branch 'ao/path-use-xmalloc' | Junio C Hamano | 2017-10-28 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | path.c: use xmalloc() in add_to_trie() | Andrey Okoshkin | 2017-10-25 | 1 | -1/+1 |
* | | | | | | Merge branch 'np/config-path-doc' | Junio C Hamano | 2017-10-28 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config doc: clarify "git config --path" example | Nathan Payre | 2017-10-19 | 1 | -4/+4 |
* | | | | | | | Merge branch 'mh/ref-locking-fix' | Junio C Hamano | 2017-10-26 | 2 | -1/+142 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | files_transaction_prepare(): fix handling of ref lock failure | Michael Haggerty | 2017-10-25 | 2 | -9/+9 |
| * | | | | | | | t1404: add a bunch of tests of D/F conflicts | Michael Haggerty | 2017-10-25 | 1 | -0/+141 |
* | | | | | | | | Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po | Junio C Hamano | 2017-10-24 | 12 | -24768/+42782 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git | Jiang Xin | 2017-10-24 | 1 | -2414/+2557 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | l10n: zh_CN: review for git v2.15.0 l10n round 2 | Ray Chen | 2017-10-24 | 1 | -2/+2 |
| | * | | | | | | | l10n: zh_CN: for git v2.15.0 l10n round 2 | Jiang Xin | 2017-10-24 | 1 | -2414/+2557 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' of https://github.com/ralfth/git-po-de | Jiang Xin | 2017-10-24 | 1 | -2448/+2630 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | l10n: de.po: fix typos | Andre Hinrichs | 2017-10-23 | 1 | -14/+14 |
| | * | | | | | | | l10n: de.po: translate 70 new messages | Ralf Thielow | 2017-10-23 | 1 | -2435/+2617 |
| |/ / / / / / / | |||||
| * | | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2017-10-22 | 1 | -50/+50 |
| * | | | | | | | Merge branch 'master' of https://github.com/vnwildman/git | Jiang Xin | 2017-10-22 | 1 | -51/+55 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2 | Tran Ngoc Quan | 2017-10-19 | 1 | -51/+55 |
| * | | | | | | | | Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git | Jiang Xin | 2017-10-19 | 1 | -2427/+2612 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | l10n: fr.po: v2.15.0 round 2 | Jean-Noel Avila | 2017-10-18 | 1 | -2424/+2612 |
| | * | | | | | | | | l10n: fr.po change translation of "First, rewinding" | Nicolas Cornu | 2017-10-18 | 1 | -2/+1 |
| | * | | | | | | | | l10n: fr.po fix some mistakes | Jean-Noel Avila | 2017-10-18 | 1 | -7/+5 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv | Jiang Xin | 2017-10-19 | 1 | -55/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | l10n: sv.po: Update Swedish translation (3245t0f0u) | Peter Krefting | 2017-10-18 | 1 | -55/+58 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of https://github.com/Softcatala/git-po | Jiang Xin | 2017-10-19 | 1 | -3008/+2991 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | l10n: Update Catalan translation | Jordi Mas | 2017-10-17 | 1 | -3008/+2991 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'translation' of https://github.com/ChrisADR/git-po | Jiang Xin | 2017-10-19 | 1 | -50/+54 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | l10n: es.po: v2.15.0 round 2 | Christopher Díaz Riveros | 2017-10-17 | 1 | -50/+54 |
| | |/ / / / / / / | |||||
| * / / / / / / / | l10n: ko.po: Update Korean translation | Changwoo Ryu | 2017-10-17 | 1 | -2411/+2535 |
| |/ / / / / / / | |||||
| * | | | | | | | l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed) | Jiang Xin | 2017-10-17 | 1 | -47/+48 |