summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* revision: drop --show-all optionjk/cached-commit-bufferJeff King2018-02-223-42/+0
* commit: drop uses of get_cached_commit_buffer()Jeff King2018-02-222-4/+1
* Git 2.16.2v2.16.2Junio C Hamano2018-02-153-2/+32
* Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maintJunio C Hamano2018-02-151-3/+4
|\
| * cat-file doc: document that -e will return some outputab/doc-cat-file-e-still-shows-errorsÆvar Arnfjörð Bjarmason2018-01-101-3/+4
* | Merge branch 'as/read-tree-prefix-doc-fix' into maintJunio C Hamano2018-02-151-3/+2
|\ \
| * | doc/read-tree: remove obsolete remarkas/read-tree-prefix-doc-fixAndreas G. Schacker2018-01-091-3/+2
* | | Merge branch 'nd/add-i-ignore-submodules' into maintJunio C Hamano2018-02-152-1/+49
|\ \ \
| * | | add--interactive: ignore submodule changes except HEADnd/add-i-ignore-submodulesNguyễn Thái Ngọc Duy2018-01-162-1/+49
* | | | Merge branch 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2018-02-152-3/+34
|\ \ \ \
| * | | | stash: don't delete untracked files that match pathspectg/stash-with-pathspec-fixThomas Gummerer2018-01-082-3/+34
| | |_|/ | |/| |
* | | | Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-152-33/+98
|\ \ \ \
| * | | | clone: do not clean up directories we didn't createjk/abort-clone-with-existing-destJeff King2018-01-032-9/+67
| * | | | clone: factor out dir_exists() helperJeff King2018-01-031-3/+8
| * | | | t5600: modernize styleJeff King2018-01-031-23/+25
| * | | | t5600: fix outdated comment about unborn HEADJeff King2018-01-031-1/+1
| |/ / /
* | | | Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2018-02-152-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' into maintJunio C Hamano2018-02-1510-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' into maintJunio C Hamano2018-02-151-0/+1
|\ \ \ \ \
| * | | | | git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.jm/svn-pushmergeinfo-fixJason Merrill2017-09-171-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2018-02-152-3/+10
|\ \ \ \ \
| * | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-272-3/+10
| | |/ / / | |/| | |
* | | | | Merge branch 'ab/perf-grep-threads' into maintJunio C Hamano2018-02-152-21/+86
|\ \ \ \ \
| * | | | | perf: amend the grep tests to test grep.threadsab/perf-grep-threadsÆvar Arnfjörð Bjarmason2018-01-042-21/+86
* | | | | | 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
* | | | | | | 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
| |/ / / / / / /