Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dl/mergetool-gui-option' | Junio C Hamano | 2018-10-30 | 6 | -8/+46 |
|\ | |||||
| * | doc: document diff/merge.guitool config keys | Denton Liu | 2018-10-25 | 2 | -0/+14 |
| * | completion: support `git mergetool --[no-]gui` | Denton Liu | 2018-10-25 | 1 | -1/+1 |
| * | mergetool: accept -g/--[no-]gui as arguments | Denton Liu | 2018-10-25 | 3 | -7/+31 |
* | | Merge branch 'js/mingw-load-sys-dll' | Junio C Hamano | 2018-10-30 | 2 | -2/+4 |
|\ \ | |||||
| * | | mingw: load system libraries the recommended way | Johannes Schindelin | 2018-10-24 | 2 | -2/+4 |
| |/ | |||||
* | | Merge branch 'js/mingw-getcwd' | Junio C Hamano | 2018-10-30 | 1 | -2/+48 |
|\ \ | |||||
| * | | mingw: fix getcwd when the parent directory cannot be queried | Anton Serbulov | 2018-10-24 | 1 | -0/+39 |
| * | | mingw: ensure `getcwd()` reports the correct case | Johannes Schindelin | 2018-10-24 | 1 | -2/+9 |
| |/ | |||||
* | | Merge branch 'cb/khash-maybe-unused-function' | Junio C Hamano | 2018-10-30 | 3 | -3/+5 |
|\ \ | |||||
| * | | khash: silence -Wunused-function for delta-islands | Carlo Marcelo Arenas Belón | 2018-10-24 | 1 | -1/+1 |
| * | | commit-slabs: move MAYBE_UNUSED out | Carlo Marcelo Arenas Belón | 2018-10-24 | 2 | -2/+4 |
| |/ | |||||
* | | Merge branch 'jc/cocci-preincr' | Junio C Hamano | 2018-10-30 | 2 | -1/+6 |
|\ \ | |||||
| * | | fsck: s/++i > 1/i++/ | Junio C Hamano | 2018-10-24 | 1 | -1/+1 |
| * | | cocci: simplify "if (++u > 1)" to "if (u++)" | Junio C Hamano | 2018-10-24 | 1 | -0/+5 |
* | | | Merge branch 'ss/rename-tests' | Junio C Hamano | 2018-10-30 | 7 | -147/+137 |
|\ \ \ | |||||
| * | | | t7501: rename commit test to comply with naming convention | Stephen P. Smith | 2018-10-23 | 1 | -0/+0 |
| * | | | t7500: rename commit tests script to comply with naming convention | Stephen P. Smith | 2018-10-23 | 1 | -1/+1 |
| * | | | t7502: rename commit test script to comply with naming convention | Stephen P. Smith | 2018-10-23 | 1 | -0/+0 |
| * | | | t7509: cleanup description and filename | Stephen P. Smith | 2018-10-23 | 1 | -1/+1 |
| * | | | t2000: rename and combine checkout clash tests | Stephen P. Smith | 2018-10-23 | 3 | -145/+135 |
| | |/ | |/| | |||||
* | | | Merge branch 'ah/doc-updates' | Junio C Hamano | 2018-10-30 | 12 | -79/+92 |
|\ \ \ | |||||
| * | | | doc: fix formatting in git-update-ref | Andreas Heiduk | 2018-10-23 | 1 | -4/+4 |
| * | | | doc: fix indentation of listing blocks in gitweb.conf.txt | Andreas Heiduk | 2018-10-23 | 1 | -10/+15 |
| * | | | doc: fix descripion for 'git tag --format' | Andreas Heiduk | 2018-10-23 | 1 | -6/+6 |
| * | | | doc: fix inappropriate monospace formatting | Andreas Heiduk | 2018-10-23 | 5 | -32/+40 |
| * | | | doc: fix ASCII art tab spacing | Andreas Heiduk | 2018-10-23 | 3 | -25/+25 |
| * | | | doc: clarify boundaries of 'git worktree list --porcelain' | Andreas Heiduk | 2018-10-23 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'ds/reachable' | Junio C Hamano | 2018-10-30 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | commit-reach: fix cast in compare_commits_by_gen() | René Scharfe | 2018-10-23 | 1 | -2/+2 |
* | | | | Merge branch 'jc/receive-deny-current-branch-fix' | Junio C Hamano | 2018-10-30 | 2 | -4/+16 |
|\ \ \ \ | |||||
| * | | | | receive: denyCurrentBranch=updateinstead should not blindly update | Junio C Hamano | 2018-10-19 | 2 | -4/+16 |
* | | | | | Merge branch 'ds/ci-commit-graph-and-midx' | Junio C Hamano | 2018-10-30 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | ci: add optional test variables | Derrick Stolee | 2018-10-19 | 1 | -0/+2 |
* | | | | | | Merge branch 'jk/unused-function' | Junio C Hamano | 2018-10-30 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config.mak.dev: enable -Wunused-function | Jeff King | 2018-10-19 | 1 | -1/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'cb/remove-dead-init' | Junio C Hamano | 2018-10-30 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | multi-pack-index: avoid dead store for struct progress | Carlo Marcelo Arenas Belón | 2018-10-19 | 1 | -1/+1 |
| * | | | | | | unpack-trees: avoid dead store for struct progress | Carlo Marcelo Arenas Belón | 2018-10-19 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/diff-notice-has-drive-prefix' | Junio C Hamano | 2018-10-30 | 2 | -2/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: don't attempt to strip prefix from absolute Windows paths | Johannes Sixt | 2018-10-22 | 2 | -2/+12 |
* | | | | | | | Merge branch 'ot/ref-filter-plug-leaks' | Junio C Hamano | 2018-10-30 | 2 | -43/+59 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ref-filter: free item->value and item->value->s | Olga Telezhnaya | 2018-10-19 | 1 | -42/+54 |
| * | | | | | | | ls-remote: release memory instead of UNLEAK | Olga Telezhnaya | 2018-10-19 | 1 | -1/+1 |
| * | | | | | | | ref-filter: free memory from used_atom | Olga Telezhnaya | 2018-10-19 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'ds/reachable-first-parent-fix' | Junio C Hamano | 2018-10-30 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit-reach: fix first-parent heuristic | Derrick Stolee | 2018-10-19 | 1 | -1/+3 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rj/header-guards' | Junio C Hamano | 2018-10-30 | 10 | -20/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | headers: normalize the spelling of some header guards | Ramsay Jones | 2018-10-18 | 10 | -20/+20 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/test-tool-help' | Junio C Hamano | 2018-10-30 | 1 | -2/+13 |
|\ \ \ \ \ \ \ \ |