summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dl/mergetool-gui-option'Junio C Hamano2018-10-306-8/+46
|\
| * doc: document diff/merge.guitool config keysDenton Liu2018-10-252-0/+14
| * completion: support `git mergetool --[no-]gui`Denton Liu2018-10-251-1/+1
| * mergetool: accept -g/--[no-]gui as argumentsDenton Liu2018-10-253-7/+31
* | Merge branch 'js/mingw-load-sys-dll'Junio C Hamano2018-10-302-2/+4
|\ \
| * | mingw: load system libraries the recommended wayJohannes Schindelin2018-10-242-2/+4
| |/
* | Merge branch 'js/mingw-getcwd'Junio C Hamano2018-10-301-2/+48
|\ \
| * | mingw: fix getcwd when the parent directory cannot be queriedAnton Serbulov2018-10-241-0/+39
| * | mingw: ensure `getcwd()` reports the correct caseJohannes Schindelin2018-10-241-2/+9
| |/
* | Merge branch 'cb/khash-maybe-unused-function'Junio C Hamano2018-10-303-3/+5
|\ \
| * | khash: silence -Wunused-function for delta-islandsCarlo Marcelo Arenas Belón2018-10-241-1/+1
| * | commit-slabs: move MAYBE_UNUSED outCarlo Marcelo Arenas Belón2018-10-242-2/+4
| |/
* | Merge branch 'jc/cocci-preincr'Junio C Hamano2018-10-302-1/+6
|\ \
| * | fsck: s/++i > 1/i++/Junio C Hamano2018-10-241-1/+1
| * | cocci: simplify "if (++u > 1)" to "if (u++)"Junio C Hamano2018-10-241-0/+5
* | | Merge branch 'ss/rename-tests'Junio C Hamano2018-10-307-147/+137
|\ \ \
| * | | t7501: rename commit test to comply with naming conventionStephen P. Smith2018-10-231-0/+0
| * | | t7500: rename commit tests script to comply with naming conventionStephen P. Smith2018-10-231-1/+1
| * | | t7502: rename commit test script to comply with naming conventionStephen P. Smith2018-10-231-0/+0
| * | | t7509: cleanup description and filenameStephen P. Smith2018-10-231-1/+1
| * | | t2000: rename and combine checkout clash testsStephen P. Smith2018-10-233-145/+135
| | |/ | |/|
* | | Merge branch 'ah/doc-updates'Junio C Hamano2018-10-3012-79/+92
|\ \ \
| * | | doc: fix formatting in git-update-refAndreas Heiduk2018-10-231-4/+4
| * | | doc: fix indentation of listing blocks in gitweb.conf.txtAndreas Heiduk2018-10-231-10/+15
| * | | doc: fix descripion for 'git tag --format'Andreas Heiduk2018-10-231-6/+6
| * | | doc: fix inappropriate monospace formattingAndreas Heiduk2018-10-235-32/+40
| * | | doc: fix ASCII art tab spacingAndreas Heiduk2018-10-233-25/+25
| * | | doc: clarify boundaries of 'git worktree list --porcelain'Andreas Heiduk2018-10-231-2/+2
| | |/ | |/|
* | | Merge branch 'ds/reachable'Junio C Hamano2018-10-301-2/+2
|\ \ \
| * | | commit-reach: fix cast in compare_commits_by_gen()René Scharfe2018-10-231-2/+2
* | | | Merge branch 'jc/receive-deny-current-branch-fix'Junio C Hamano2018-10-302-4/+16
|\ \ \ \
| * | | | receive: denyCurrentBranch=updateinstead should not blindly updateJunio C Hamano2018-10-192-4/+16
* | | | | Merge branch 'ds/ci-commit-graph-and-midx'Junio C Hamano2018-10-301-0/+2
|\ \ \ \ \
| * | | | | ci: add optional test variablesDerrick Stolee2018-10-191-0/+2
* | | | | | Merge branch 'jk/unused-function'Junio C Hamano2018-10-301-1/+0
|\ \ \ \ \ \
| * | | | | | config.mak.dev: enable -Wunused-functionJeff King2018-10-191-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'cb/remove-dead-init'Junio C Hamano2018-10-302-2/+2
|\ \ \ \ \ \
| * | | | | | multi-pack-index: avoid dead store for struct progressCarlo Marcelo Arenas Belón2018-10-191-1/+1
| * | | | | | unpack-trees: avoid dead store for struct progressCarlo Marcelo Arenas Belón2018-10-191-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/diff-notice-has-drive-prefix'Junio C Hamano2018-10-302-2/+12
|\ \ \ \ \ \
| * | | | | | diff: don't attempt to strip prefix from absolute Windows pathsJohannes Sixt2018-10-222-2/+12
* | | | | | | Merge branch 'ot/ref-filter-plug-leaks'Junio C Hamano2018-10-302-43/+59
|\ \ \ \ \ \ \
| * | | | | | | ref-filter: free item->value and item->value->sOlga Telezhnaya2018-10-191-42/+54
| * | | | | | | ls-remote: release memory instead of UNLEAKOlga Telezhnaya2018-10-191-1/+1
| * | | | | | | ref-filter: free memory from used_atomOlga Telezhnaya2018-10-191-0/+4
* | | | | | | | Merge branch 'ds/reachable-first-parent-fix'Junio C Hamano2018-10-301-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-reach: fix first-parent heuristicDerrick Stolee2018-10-191-1/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rj/header-guards'Junio C Hamano2018-10-3010-20/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | headers: normalize the spelling of some header guardsRamsay Jones2018-10-1810-20/+20
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/test-tool-help'Junio C Hamano2018-10-301-2/+13
|\ \ \ \ \ \ \ \