summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dw/diff-highlight-makefile-fix'Junio C Hamano2017-09-191-0/+3
|\
| * diff-highlight: add clean target to Makefiledw/diff-highlight-makefile-fixDaniel Watkins2017-09-061-0/+3
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-103-4/+4
|\ \
| * | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-233-4/+4
* | | Merge branch 'eb/contacts-reported-by'Junio C Hamano2017-08-111-1/+1
|\ \ \
| * | | git-contacts: also recognise "Reported-by:"eb/contacts-reported-byEric Blake2017-07-271-1/+1
| |/ /
* | | Merge branch 'rg/rerere-train-overwrite'Junio C Hamano2017-08-111-2/+52
|\ \ \ | |_|/ |/| |
| * | contrib/rerere-train: optionally overwrite existing resolutionsrg/rerere-train-overwriteRaman Gupta2017-07-261-2/+52
| |/
* | add MOVE_ARRAYRené Scharfe2017-07-171-0/+17
|/
* Merge branch 'rs/free-and-null'Junio C Hamano2017-07-101-9/+1
|\
| * coccinelle: polish FREE_AND_NULL rulesrs/free-and-nullRené Scharfe2017-06-291-9/+1
* | Merge branch 'xz/send-email-batch-size'Junio C Hamano2017-07-061-0/+2
|\ \
| * | send-email: --batch-size to work around some SMTP server limitxiaoqiang zhao2017-07-051-0/+2
* | | Merge branch 'aw/contrib-subtree-doc-asciidoctor'Junio C Hamano2017-07-061-7/+19
|\ \ \
| * | | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctorA. Wilcox2017-06-271-7/+19
| * | | Merge branch 'rs/strbuf-add-real-path' into maintJunio C Hamano2017-03-282-0/+22
| |\ \ \
* | | | | Spelling fixesvs/typofixesVille Skyttä2017-06-273-3/+3
* | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-0/+15
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | coccinelle: add a rule to make "expression" code use FREE_AND_NULL()Ævar Arnfjörð Bjarmason2017-06-161-0/+7
| * | | | coccinelle: add a rule to make "type" code use FREE_AND_NULL()Ævar Arnfjörð Bjarmason2017-06-161-0/+8
* | | | | Merge branch 'jk/diff-highlight-module'Junio C Hamano2017-06-245-19/+82
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | diff-highlight: split code into modulejk/diff-highlight-moduleJeff King2017-06-155-19/+82
| * | | | Merge branch 'rf/completion-config-commit' into maintJunio C Hamano2017-06-131-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/url-insteadof-config' into maintJunio C Hamano2017-06-051-0/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tg/stash-push-fixup' into maintJunio C Hamano2017-06-041-1/+4
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'rf/completion'Junio C Hamano2017-06-131-1/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: add git config credentialCache.ignoreSIGHUPrf/completionRikard Falkeborn2017-06-021-0/+1
| * | | | | | | | completion: add git config credential completionsRikard Falkeborn2017-06-021-0/+3
| * | | | | | | | completion: add git config advice completionsRikard Falkeborn2017-06-021-1/+9
| * | | | | | | | completion: add git config am.threeWay completionRikard Falkeborn2017-06-021-0/+1
| * | | | | | | | completion: add git config core completionsRikard Falkeborn2017-06-021-0/+10
| * | | | | | | | completion: add git config gc completionsRikard Falkeborn2017-06-021-0/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/url-insteadof-config'Junio C Hamano2017-06-041-0/+10
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | docs/config: mention protocol implications of url.insteadOfjk/url-insteadof-configJeff King2017-06-011-0/+10
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rf/completion-config-commit'Junio C Hamano2017-06-041-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | completion: add completions for git config commitrf/completion-config-commitRikard Falkeborn2017-05-301-0/+3
| |/ / / / /
* | | | | | Merge branch 'tg/stash-push-fixup'Junio C Hamano2017-05-291-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | completion: add git stash pushtg/stash-push-fixupThomas Gummerer2017-05-171-1/+4
* | | | | | Merge branch 'js/eol-on-ourselves'Junio C Hamano2017-05-292-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | completion: mark bash script as LF-onlyJohannes Schindelin2017-05-101-0/+1
| * | | | | git-new-workdir: mark script as LF-onlyJohannes Schindelin2017-05-101-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ab/clone-no-tags'Junio C Hamano2017-05-161-0/+1
|\ \ \ \ \
| * | | | | clone: add a --no-tags option to clone without tagsÆvar Arnfjörð Bjarmason2017-05-011-0/+1
* | | | | | Merge branch 'sk/status-short-branch-color-config'Junio C Hamano2017-05-161-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-configStephen Kent2017-04-281-0/+2
* | | | | | Merge branch 'jk/complete-checkout-sans-dwim-remote'Junio C Hamano2017-05-011-1/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | completion: optionally disable checkout DWIMjk/complete-checkout-sans-dwim-remoteJeff King2017-04-231-1/+10
| |/ / / /
* | | | | completion: expand "push --delete <remote> <ref>" for refs on that <remote>ab/completion-push-delete-refÆvar Arnfjörð Bjarmason2017-04-231-0/+1
|/ / / /
* | | | Merge branch 'jc/bs-t-is-not-a-tab-for-sed'Junio C Hamano2017-04-161-2/+2
|\ \ \ \
| * | | | contrib/git-resurrect.sh: do not write \t for HT in sed scriptsjc/bs-t-is-not-a-tab-for-sedJunio C Hamano2017-03-311-2/+2