Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dw/diff-highlight-makefile-fix' | Junio C Hamano | 2017-09-19 | 1 | -0/+3 |
|\ | |||||
| * | diff-highlight: add clean target to Makefiledw/diff-highlight-makefile-fix | Daniel Watkins | 2017-09-06 | 1 | -0/+3 |
* | | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 | 3 | -4/+4 |
|\ \ | |||||
| * | | treewide: correct several "up-to-date" to "up to date"ma/up-to-date | Martin Ågren | 2017-08-23 | 3 | -4/+4 |
* | | | Merge branch 'eb/contacts-reported-by' | Junio C Hamano | 2017-08-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | git-contacts: also recognise "Reported-by:"eb/contacts-reported-by | Eric Blake | 2017-07-27 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'rg/rerere-train-overwrite' | Junio C Hamano | 2017-08-11 | 1 | -2/+52 |
|\ \ \ | |_|/ |/| | | |||||
| * | | contrib/rerere-train: optionally overwrite existing resolutionsrg/rerere-train-overwrite | Raman Gupta | 2017-07-26 | 1 | -2/+52 |
| |/ | |||||
* | | add MOVE_ARRAY | René Scharfe | 2017-07-17 | 1 | -0/+17 |
|/ | |||||
* | Merge branch 'rs/free-and-null' | Junio C Hamano | 2017-07-10 | 1 | -9/+1 |
|\ | |||||
| * | coccinelle: polish FREE_AND_NULL rulesrs/free-and-null | René Scharfe | 2017-06-29 | 1 | -9/+1 |
* | | Merge branch 'xz/send-email-batch-size' | Junio C Hamano | 2017-07-06 | 1 | -0/+2 |
|\ \ | |||||
| * | | send-email: --batch-size to work around some SMTP server limit | xiaoqiang zhao | 2017-07-05 | 1 | -0/+2 |
* | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor' | Junio C Hamano | 2017-07-06 | 1 | -7/+19 |
|\ \ \ | |||||
| * | | | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctor | A. Wilcox | 2017-06-27 | 1 | -7/+19 |
| * | | | Merge branch 'rs/strbuf-add-real-path' into maint | Junio C Hamano | 2017-03-28 | 2 | -0/+22 |
| |\ \ \ | |||||
* | | | | | Spelling fixesvs/typofixes | Ville Skyttä | 2017-06-27 | 3 | -3/+3 |
* | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -0/+15 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | coccinelle: add a rule to make "expression" code use FREE_AND_NULL() | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -0/+7 |
| * | | | | coccinelle: add a rule to make "type" code use FREE_AND_NULL() | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -0/+8 |
* | | | | | Merge branch 'jk/diff-highlight-module' | Junio C Hamano | 2017-06-24 | 5 | -19/+82 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | diff-highlight: split code into modulejk/diff-highlight-module | Jeff King | 2017-06-15 | 5 | -19/+82 |
| * | | | | Merge branch 'rf/completion-config-commit' into maint | Junio C Hamano | 2017-06-13 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/url-insteadof-config' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+10 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'tg/stash-push-fixup' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'rf/completion' | Junio C Hamano | 2017-06-13 | 1 | -1/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | completion: add git config credentialCache.ignoreSIGHUPrf/completion | Rikard Falkeborn | 2017-06-02 | 1 | -0/+1 |
| * | | | | | | | | completion: add git config credential completions | Rikard Falkeborn | 2017-06-02 | 1 | -0/+3 |
| * | | | | | | | | completion: add git config advice completions | Rikard Falkeborn | 2017-06-02 | 1 | -1/+9 |
| * | | | | | | | | completion: add git config am.threeWay completion | Rikard Falkeborn | 2017-06-02 | 1 | -0/+1 |
| * | | | | | | | | completion: add git config core completions | Rikard Falkeborn | 2017-06-02 | 1 | -0/+10 |
| * | | | | | | | | completion: add git config gc completions | Rikard Falkeborn | 2017-06-02 | 1 | -0/+4 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/url-insteadof-config' | Junio C Hamano | 2017-06-04 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | docs/config: mention protocol implications of url.insteadOfjk/url-insteadof-config | Jeff King | 2017-06-01 | 1 | -0/+10 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'rf/completion-config-commit' | Junio C Hamano | 2017-06-04 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | completion: add completions for git config commitrf/completion-config-commit | Rikard Falkeborn | 2017-05-30 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'tg/stash-push-fixup' | Junio C Hamano | 2017-05-29 | 1 | -1/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | completion: add git stash pushtg/stash-push-fixup | Thomas Gummerer | 2017-05-17 | 1 | -1/+4 |
* | | | | | | Merge branch 'js/eol-on-ourselves' | Junio C Hamano | 2017-05-29 | 2 | -0/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | completion: mark bash script as LF-only | Johannes Schindelin | 2017-05-10 | 1 | -0/+1 |
| * | | | | | git-new-workdir: mark script as LF-only | Johannes Schindelin | 2017-05-10 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ab/clone-no-tags' | Junio C Hamano | 2017-05-16 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | clone: add a --no-tags option to clone without tags | Ævar Arnfjörð Bjarmason | 2017-05-01 | 1 | -0/+1 |
* | | | | | | Merge branch 'sk/status-short-branch-color-config' | Junio C Hamano | 2017-05-16 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-config | Stephen Kent | 2017-04-28 | 1 | -0/+2 |
* | | | | | | Merge branch 'jk/complete-checkout-sans-dwim-remote' | Junio C Hamano | 2017-05-01 | 1 | -1/+10 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | completion: optionally disable checkout DWIMjk/complete-checkout-sans-dwim-remote | Jeff King | 2017-04-23 | 1 | -1/+10 |
| |/ / / / | |||||
* | | | | | completion: expand "push --delete <remote> <ref>" for refs on that <remote>ab/completion-push-delete-ref | Ævar Arnfjörð Bjarmason | 2017-04-23 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge branch 'jc/bs-t-is-not-a-tab-for-sed' | Junio C Hamano | 2017-04-16 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | contrib/git-resurrect.sh: do not write \t for HT in sed scriptsjc/bs-t-is-not-a-tab-for-sed | Junio C Hamano | 2017-03-31 | 1 | -2/+2 |