summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dl/mergetool-gui-option'Junio C Hamano2018-10-301-1/+1
|\
| * completion: support `git mergetool --[no-]gui`Denton Liu2018-10-251-1/+1
* | Merge branch 'js/mingw-load-sys-dll'Junio C Hamano2018-10-301-1/+2
|\ \
| * | mingw: load system libraries the recommended wayJohannes Schindelin2018-10-241-1/+2
| |/
* | Merge branch 'jc/cocci-preincr'Junio C Hamano2018-10-301-0/+5
|\ \
| * | cocci: simplify "if (++u > 1)" to "if (u++)"Junio C Hamano2018-10-241-0/+5
* | | Merge branch 'bc/hash-transition-part-15'Junio C Hamano2018-10-301-54/+63
|\ \ \
| * | | object_id.cocci: match only expressions of type 'struct object_id'SZEDER Gábor2018-10-151-54/+63
* | | | Merge branch 'ch/subtree-build'Junio C Hamano2018-10-301-0/+4
|\ \ \ \
| * | | | Revert "subtree: make install targets depend on build targets"Junio C Hamano2018-10-181-3/+3
| * | | | subtree: make install targets depend on build targetsChristian Hesse2018-10-161-3/+3
| * | | | subtree: add build targets 'man' and 'html'Christian Hesse2018-10-101-0/+4
| |/ / /
* | | | Merge branch 'du/cherry-is-plumbing'Junio C Hamano2018-10-261-11/+0
|\ \ \ \
| * | | | doc: move git-cherry to plumbingDaniels Umanovskis2018-10-121-11/+0
| | |/ / | |/| |
* | | | Merge branch 'ds/coverage-diff'Junio C Hamano2018-10-261-0/+108
|\ \ \ \
| * | | | contrib: add coverage-diff scriptDerrick Stolee2018-10-101-0/+108
| |/ / /
* | | | Merge branch 'rs/subtree-fixes'Junio C Hamano2018-10-261-46/+83
|\ \ \ \ | |_|_|/ |/| | |
| * | | subtree: performance improvement for finding unexpected parent commitsRoger Strain2018-10-121-1/+1
| * | | subtree: improve decision on merges kept in splitStrain, Roger L2018-10-071-2/+19
| * | | subtree: use commits before rejoins for splitsStrain, Roger L2018-10-071-6/+20
| * | | subtree: make --ignore-joins pay attention to addsStrain, Roger L2018-10-071-7/+7
| * | | subtree: refactor split of a commit into standalone methodStrain, Roger L2018-10-071-36/+42
| | |/ | |/|
* | | Merge branch 'nd/complete-fetch-multiple-args'Junio C Hamano2018-10-191-0/+1
|\ \ \
| * | | completion: support "git fetch --multiple"Nguyễn Thái Ngọc Duy2018-09-211-0/+1
| |/ /
* | | git-completion.bash: add completion for stash listSteven Fernandez2018-10-071-0/+3
|/ /
* | convert "hashcmp() != 0" to "!hasheq()"Jeff King2018-08-291-0/+9
* | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-0/+6
* | convert "hashcmp() == 0" to hasheq()Jeff King2018-08-291-0/+9
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-0/+6
* | coccinelle: use <...> for function exclusionJeff King2018-08-292-12/+12
|/
* Merge branch 'js/range-diff'Junio C Hamano2018-08-201-0/+14
|\
| * range-diff: make --dual-color the default modeJohannes Schindelin2018-08-131-1/+1
| * completion: support `git range-diff`Johannes Schindelin2018-08-131-0/+14
* | Merge branch 'es/mw-to-git-chain-fix'Junio C Hamano2018-08-151-1/+1
|\ \
| * | mw-to-git/t9360: fix broken &&-chainEric Sunshine2018-07-311-1/+1
* | | Merge branch 'jn/subtree-test-fixes'Junio C Hamano2018-08-151-90/+31
|\ \ \
| * | | subtree test: simplify preparation of expected resultsJonathan Nieder2018-07-301-89/+30
| * | | subtree test: add missing && to &&-chainJonathan Nieder2018-07-301-1/+1
| |/ /
* | | Merge branch 'js/vscode'Junio C Hamano2018-08-153-0/+390
|\ \ \ | |_|/ |/| |
| * | vscode: let cSpell work on commit messages, tooJohannes Schindelin2018-07-301-0/+2
| * | vscode: add a dictionary for cSpellJohannes Schindelin2018-07-301-1/+168
| * | vscode: use 8-space tabs, no trailing ws, etc for Git's source codeJohannes Schindelin2018-07-301-0/+8
| * | vscode: wrap commit messages at column 72 by defaultJohannes Schindelin2018-07-301-0/+4
| * | vscode: only overwrite C/C++ settingsJohannes Schindelin2018-07-301-3/+20
| * | vscode: hard-code a couple definesJohannes Schindelin2018-07-301-1/+13
| * | contrib: add a script to initialize VS Code configurationJohannes Schindelin2018-07-303-0/+180
* | | Merge branch 'ds/commit-graph-fsck'Junio C Hamano2018-08-021-1/+1
|\ \ \ | |/ / |/| |
| * | coccinelle: update commit.cocciDerrick Stolee2018-07-161-1/+1
* | | Merge branch 'tb/grep-column'Junio C Hamano2018-07-182-3/+11
|\ \ \
| * | | contrib/git-jump/git-jump: jump to exact locationTaylor Blau2018-06-222-3/+11
| | |/ | |/|