summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/cocci-preincr' into maintJunio C Hamano2018-11-211-0/+5
|\
| * cocci: simplify "if (++u > 1)" to "if (u++)"Junio C Hamano2018-10-241-0/+5
* | doc: move git-cherry to plumbingDaniels Umanovskis2018-10-121-11/+0
|/
* 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
| | |/ | |/|
* | | Merge branch 'tz/cred-netrc-cleanup'Junio C Hamano2018-06-283-6/+11
|\ \ \
| * | | git-credential-netrc: make "all" default target of MakefileTodd Zullinger2018-06-181-0/+3
| * | | git-credential-netrc: fix exit status when tests failLuis Marsano2018-06-181-1/+3
| * | | git-credential-netrc: use in-tree Git.pm for testsLuis Marsano2018-06-182-2/+2
| * | | git-credential-netrc: minor whitespace cleanup in test scriptTodd Zullinger2018-06-181-4/+4
* | | | Merge branch 'nd/completion-negation'Junio C Hamano2018-06-281-24/+37
|\ \ \ \ | |_|_|/ |/| | |
| * | | completion: collapse extra --no-.. optionsNguyễn Thái Ngọc Duy2018-06-111-0/+23
| * | | parse-options: option to let --git-completion-helper show negative formNguyễn Thái Ngọc Duy2018-05-291-24/+14
* | | | Merge branch 'ls/complete-remote-update-names'Junio C Hamano2018-06-251-1/+1
|\ \ \ \
| * | | | completion: complete remote names tooŁukasz Stelmach2018-06-011-1/+1
* | | | | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-251-333/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | completion: complete general config vars in two stepsNguyễn Thái Ngọc Duy2018-05-291-2/+7
| * | | | completion: support case-insensitive config varsNguyễn Thái Ngọc Duy2018-05-291-1/+9
| * | | | completion: keep other config var completion in camelCaseNguyễn Thái Ngọc Duy2018-05-291-6/+6
| * | | | completion: drop the hard coded list of config varsNguyễn Thái Ngọc Duy2018-05-291-326/+9
| * | | | Merge branch 'nd/command-list' into nd/complete-config-varsJunio C Hamano2018-05-291-132/+16
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'ab/cred-netrc-no-autodie'Junio C Hamano2018-06-181-1/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git-credential-netrc: remove use of "autodie"Ævar Arnfjörð Bjarmason2018-06-131-1/+0
* | | | | Merge branch 'sg/completion-zsh-workaround'Junio C Hamano2018-06-132-2/+5
|\ \ \ \ \
| * | | | | completion: correct zsh detection when run from git-completion.zshSZEDER Gábor2018-06-122-2/+5
* | | | | | Merge branch 'pa/import-tars-long-names'Junio C Hamano2018-06-011-2/+29
|\ \ \ \ \ \
| * | | | | | import-tars: read overlong names from pax extended headerPedro Alvarez Piedehierro2018-05-241-2/+29
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/command-list'Junio C Hamano2018-06-011-132/+16
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | completion: allow to customize the completable command listNguyễn Thái Ngọc Duy2018-05-211-1/+1
| * | | | | completion: add and use --list-cmds=aliasNguyễn Thái Ngọc Duy2018-05-211-60/+15
| * | | | | completion: add and use --list-cmds=nohelpersNguyễn Thái Ngọc Duy2018-05-211-16/+4
| * | | | | completion: let git provide the completable command listNguyễn Thái Ngọc Duy2018-05-211-91/+28