summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano2018-01-232-4/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirsJunio C Hamano2018-01-032-4/+45
* | | | | | | | | | Merge branch 'rs/lose-leak-pending'Junio C Hamano2018-01-2310-86/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: remove unused function clear_commit_marks_for_object_array()rs/lose-leak-pendingRené Scharfe2017-12-282-15/+0
| * | | | | | | | | | revision: remove the unused flag leak_pendingRené Scharfe2017-12-282-14/+1
| * | | | | | | | | | checkout: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-12/+1
| * | | | | | | | | | bundle: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-19/+16
| * | | | | | | | | | bisect: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-21/+9
| * | | | | | | | | | object: add clear_commit_marks_all()René Scharfe2017-12-282-0/+16
| * | | | | | | | | | ref-filter: use clear_commit_marks_many() in do_merge_filter()René Scharfe2017-12-281-2/+1
| * | | | | | | | | | commit: use clear_commit_marks_many() in remove_redundant()René Scharfe2017-12-281-2/+1
| * | | | | | | | | | commit: avoid allocation in clear_commit_marks_many()René Scharfe2017-12-281-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jm/svn-pushmergeinfo-fix'Junio C Hamano2018-01-231-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.jm/svn-pushmergeinfo-fixJason Merrill2017-09-171-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/ita-wt-renames-in-status'Junio C Hamano2018-01-236-44/+143
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wt-status.c: handle worktree renamesnd/ita-wt-renames-in-statusNguyễn Thái Ngọc Duy2017-12-273-13/+92
| * | | | | | | | | | wt-status.c: rename rename-related fields in wt_status_change_dataNguyễn Thái Ngọc Duy2017-12-272-26/+29
| * | | | | | | | | | wt-status.c: catch unhandled diff status codesNguyễn Thái Ngọc Duy2017-12-271-2/+6
| * | | | | | | | | | wt-status.c: coding style fixNguyễn Thái Ngọc Duy2017-12-271-1/+2
| * | | | | | | | | | Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy2017-12-273-4/+4
| * | | | | | | | | | t2203: test status output with porcelain v2 formatNguyễn Thái Ngọc Duy2017-12-271-0/+12
* | | | | | | | | | | Merge branch 'dk/describe-all-output-fix'Junio C Hamano2018-01-232-3/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-272-3/+10
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Sync with v2.16.1Junio C Hamano2018-01-213-1/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Git 2.16.1v2.16.1Junio C Hamano2018-01-213-2/+13
| * | | | | | | | | | | Merge branch 'bc/hash-algo' into maintJunio C Hamano2018-01-212-1/+18
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | t5601-clone: test case-conflicting files on case-insensitive filesystemEric Sunshine2018-01-211-0/+17
| | * | | | | | | | | | | repository: pre-initialize hash algo pointerbrian m. carlson2018-01-191-1/+1
* | | | | | | | | | | | | Start 2.17 cycleJunio C Hamano2018-01-213-2/+21
|/ / / / / / / / / / / /
* | | | | | | | | | | | Git 2.16v2.16.0Junio C Hamano2018-01-172-3/+6
* | | | | | | | | | | | Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2018-01-1612-20028/+22202
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | l10n: de.po: translate 72 new messagesRalf Thielow2018-01-151-1934/+2172
| * | | | | | | | | | | | l10n: de.po: improve messages when a branch starts to track another refRalf Thielow2018-01-151-8/+8
| * | | | | | | | | | | | l10n: bg.po: Updated Bulgarian translation (3288t)Alexander Shopov2018-01-111-181/+203
| * | | | | | | | | | | | l10n: TEAMS: add zh_CN team membersJiang Xin2018-01-101-0/+1
| * | | | | | | | | | | | l10n: zh_CN: for git v2.16.0 l10n round 2Jiang Xin2018-01-101-1920/+2144
| * | | | | | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2018-01-101-181/+197
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | l10n: sv.po: Update Swedish translation (3288t0f0u)Peter Krefting2018-01-091-181/+197
| * | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2018-01-101-1918/+2092
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2018-01-091-1918/+2092
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | l10n: TEAMS: Add ko team membersChangwoo Ryu2018-01-091-0/+2
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-koJiang Xin2018-01-092-1944/+2200
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2018-01-082-1944/+2200
| * | | | | | | | | | | | | Merge branch '2.16' of https://github.com/ChrisADR/git-poJiang Xin2018-01-081-181/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | l10n: es.po: Spanish translation 2.16.0 round 2Christopher Díaz Riveros2018-01-071-181/+197
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/gitJiang Xin2018-01-081-192/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | l10n: fr.po 2.16 round 2Jean-Noel Avila2018-01-071-192/+225
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2Tran Ngoc Quan2018-01-071-1929/+2156
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)Jiang Xin2018-01-071-173/+192
| * | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2018-01-078-10292/+11238
| |\ \ \ \ \ \ \ \ \ \ \ \