Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'jc/merge-symlink-ours-theirs' | Junio C Hamano | 2018-01-23 | 2 | -4/+45 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirs | Junio C Hamano | 2018-01-03 | 2 | -4/+45 | |
* | | | | | | | | | | Merge branch 'rs/lose-leak-pending' | Junio C Hamano | 2018-01-23 | 10 | -86/+46 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | commit: remove unused function clear_commit_marks_for_object_array()rs/lose-leak-pending | René Scharfe | 2017-12-28 | 2 | -15/+0 | |
| * | | | | | | | | | | revision: remove the unused flag leak_pending | René Scharfe | 2017-12-28 | 2 | -14/+1 | |
| * | | | | | | | | | | checkout: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -12/+1 | |
| * | | | | | | | | | | bundle: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -19/+16 | |
| * | | | | | | | | | | bisect: avoid using the rev_info flag leak_pending | René Scharfe | 2017-12-28 | 1 | -21/+9 | |
| * | | | | | | | | | | object: add clear_commit_marks_all() | René Scharfe | 2017-12-28 | 2 | -0/+16 | |
| * | | | | | | | | | | ref-filter: use clear_commit_marks_many() in do_merge_filter() | René Scharfe | 2017-12-28 | 1 | -2/+1 | |
| * | | | | | | | | | | commit: use clear_commit_marks_many() in remove_redundant() | René Scharfe | 2017-12-28 | 1 | -2/+1 | |
| * | | | | | | | | | | commit: avoid allocation in clear_commit_marks_many() | René Scharfe | 2017-12-28 | 1 | -1/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jm/svn-pushmergeinfo-fix' | Junio C Hamano | 2018-01-23 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.jm/svn-pushmergeinfo-fix | Jason Merrill | 2017-09-17 | 1 | -0/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'nd/ita-wt-renames-in-status' | Junio C Hamano | 2018-01-23 | 6 | -44/+143 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | wt-status.c: handle worktree renamesnd/ita-wt-renames-in-status | Nguyễn Thái Ngọc Duy | 2017-12-27 | 3 | -13/+92 | |
| * | | | | | | | | | | wt-status.c: rename rename-related fields in wt_status_change_data | Nguyễn Thái Ngọc Duy | 2017-12-27 | 2 | -26/+29 | |
| * | | | | | | | | | | wt-status.c: catch unhandled diff status codes | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -2/+6 | |
| * | | | | | | | | | | wt-status.c: coding style fix | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -1/+2 | |
| * | | | | | | | | | | Use DIFF_DETECT_RENAME for detect_rename assignments | Nguyễn Thái Ngọc Duy | 2017-12-27 | 3 | -4/+4 | |
| * | | | | | | | | | | t2203: test status output with porcelain v2 format | Nguyễn Thái Ngọc Duy | 2017-12-27 | 1 | -0/+12 | |
* | | | | | | | | | | | Merge branch 'dk/describe-all-output-fix' | Junio C Hamano | 2018-01-23 | 2 | -3/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fix | Daniel Knittl-Frank | 2017-12-27 | 2 | -3/+10 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Sync with v2.16.1 | Junio C Hamano | 2018-01-21 | 3 | -1/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Git 2.16.1v2.16.1 | Junio C Hamano | 2018-01-21 | 3 | -2/+13 | |
| * | | | | | | | | | | | Merge branch 'bc/hash-algo' into maint | Junio C Hamano | 2018-01-21 | 2 | -1/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | t5601-clone: test case-conflicting files on case-insensitive filesystem | Eric Sunshine | 2018-01-21 | 1 | -0/+17 | |
| | * | | | | | | | | | | | repository: pre-initialize hash algo pointer | brian m. carlson | 2018-01-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Start 2.17 cycle | Junio C Hamano | 2018-01-21 | 3 | -2/+21 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Git 2.16v2.16.0 | Junio C Hamano | 2018-01-17 | 2 | -3/+6 | |
* | | | | | | | | | | | | Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-po | Junio C Hamano | 2018-01-16 | 12 | -20028/+22202 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | l10n: de.po: translate 72 new messages | Ralf Thielow | 2018-01-15 | 1 | -1934/+2172 | |
| * | | | | | | | | | | | | l10n: de.po: improve messages when a branch starts to track another ref | Ralf Thielow | 2018-01-15 | 1 | -8/+8 | |
| * | | | | | | | | | | | | l10n: bg.po: Updated Bulgarian translation (3288t) | Alexander Shopov | 2018-01-11 | 1 | -181/+203 | |
| * | | | | | | | | | | | | l10n: TEAMS: add zh_CN team members | Jiang Xin | 2018-01-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | | l10n: zh_CN: for git v2.16.0 l10n round 2 | Jiang Xin | 2018-01-10 | 1 | -1920/+2144 | |
| * | | | | | | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv | Jiang Xin | 2018-01-10 | 1 | -181/+197 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | l10n: sv.po: Update Swedish translation (3288t0f0u) | Peter Krefting | 2018-01-09 | 1 | -181/+197 | |
| * | | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2018-01-10 | 1 | -1918/+2092 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2018-01-09 | 1 | -1918/+2092 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | l10n: TEAMS: Add ko team members | Changwoo Ryu | 2018-01-09 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-ko | Jiang Xin | 2018-01-09 | 2 | -1944/+2200 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | l10n: ko.po: Update Korean translation | Changwoo Ryu | 2018-01-08 | 2 | -1944/+2200 | |
| * | | | | | | | | | | | | | Merge branch '2.16' of https://github.com/ChrisADR/git-po | Jiang Xin | 2018-01-08 | 1 | -181/+197 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | l10n: es.po: Spanish translation 2.16.0 round 2 | Christopher Díaz Riveros | 2018-01-07 | 1 | -181/+197 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/git | Jiang Xin | 2018-01-08 | 1 | -192/+225 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | l10n: fr.po 2.16 round 2 | Jean-Noel Avila | 2018-01-07 | 1 | -192/+225 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2 | Tran Ngoc Quan | 2018-01-07 | 1 | -1929/+2156 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed) | Jiang Xin | 2018-01-07 | 1 | -173/+192 | |
| * | | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-po | Jiang Xin | 2018-01-07 | 8 | -10292/+11238 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ |