Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'sb/t4005-modernize' into maint | Junio C Hamano | 2017-07-10 | 1 | -52/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/apply-validate-input' into maint | Junio C Hamano | 2017-07-10 | 4 | -7/+86 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/pack-bitmap-unaligned' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/rebase-i-regression-fix-tests' into maint | Junio C Hamano | 2017-07-10 | 4 | -12/+148 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-p-commentchar-fix' into maint | Junio C Hamano | 2017-07-10 | 2 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/alias-early-config' into maint | Junio C Hamano | 2017-07-10 | 8 | -61/+49 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/pretty-add-again' into maint | Junio C Hamano | 2017-07-10 | 3 | -45/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/doc-gitattributes-empty-index' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-highlight-module' into maint | Junio C Hamano | 2017-07-10 | 5 | -19/+82 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: fix typo | Ralf Thielow | 2017-07-10 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sixteenth batch for 2.14 | Junio C Hamano | 2017-07-10 | 1 | -0/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-walk-maint' | Junio C Hamano | 2017-07-10 | 3 | -12/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: include all fields when freeing complete_reflogsjk/reflog-walk-maint | Jeff King | 2017-07-07 | 1 | -8/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: don't free reflogs added to cache | Jeff King | 2017-07-07 | 2 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: duplicate strings in complete_reflogs list | Jeff King | 2017-07-07 | 2 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: skip over double-null oid due to HEAD rename | Jeff King | 2017-07-05 | 2 | -0/+13 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb/unicode-10.0' | Junio C Hamano | 2017-07-10 | 1 | -13/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | unicode: update the width tables to Unicode 10bb/unicode-10.0 | Beat Bolli | 2017-07-07 | 1 | -13/+29 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/typofix-commit-c-comment' | Junio C Hamano | 2017-07-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/commit.c: fix a typo in the commentks/typofix-commit-c-comment | Kaartic Sivaraam | 2017-07-06 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | 16 | -29/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | wildmatch: remove unused wildopts parameterab/wildmatch | Ævar Arnfjörð Bjarmason | 2017-06-23 | 16 | -29/+22 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sha1dc' | Junio C Hamano | 2017-07-10 | 4 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1collisiondetection: automatically enable when submodule is populatedab/sha1dc | Junio C Hamano | 2017-07-03 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1dc: optionally use sha1collisiondetection as a submodule | Ævar Arnfjörð Bjarmason | 2017-07-03 | 4 | -0/+20 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'pw/unquote-path-in-git-pm' | Junio C Hamano | 2017-07-10 | 3 | -43/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9700: add tests for Git::unquote_path()pw/unquote-path-in-git-pm | Phillip Wood | 2017-06-30 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git::unquote_path(): throw an exception on bad path | Phillip Wood | 2017-06-30 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git::unquote_path(): handle '\a' | Phillip Wood | 2017-06-30 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add -i: move unquote_path() to Git.pm | Phillip Wood | 2017-06-30 | 2 | -43/+53 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/commit-assuming-only-warning-removal' | Junio C Hamano | 2017-07-10 | 2 | -8/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-template: distinguish status information unconditionallyks/commit-assuming-only-warning-removal | Kaartic Sivaraam | 2017-06-30 | 2 | -2/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-template: remove outdated notice about explicit paths | Kaartic Sivaraam | 2017-06-30 | 1 | -6/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fifteenth batch for 2.14 | Junio C Hamano | 2017-07-06 | 1 | -0/+24 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/strbuf-addftime-tzname-boolify' | Junio C Hamano | 2017-07-06 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strbuf: change an always NULL/"" strbuf_addftime() param to boolab/strbuf-addftime-tzname-boolify | Ævar Arnfjörð Bjarmason | 2017-07-01 | 3 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strbuf.h comment: discuss strbuf_addftime() arguments in order | Ævar Arnfjörð Bjarmason | 2017-06-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'xz/send-email-batch-size' | Junio C Hamano | 2017-07-06 | 4 | -0/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: --batch-size to work around some SMTP server limit | xiaoqiang zhao | 2017-07-05 | 4 | -0/+45 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' | Junio C Hamano | 2017-07-06 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5534: fix misleading grep invocationjs/t5534-rev-parse-gives-multi-line-output-fix | Johannes Schindelin | 2017-07-05 | 1 | -4/+10 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/merge-recursive-code-cleanup' | Junio C Hamano | 2017-07-06 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: use DIFF_XDL_SET macrosb/merge-recursive-code-cleanup | Stefan Beller | 2017-06-30 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/apply-avoid-over-reading' | Junio C Hamano | 2017-07-06 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: use starts_with() in gitdiff_verify_name() | René Scharfe | 2017-07-01 | 1 | -2/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sha1dc-maint' | Junio C Hamano | 2017-07-06 | 1 | -22/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1dc: update from upstreamab/sha1dc-maint | Ævar Arnfjörð Bjarmason | 2017-07-03 | 1 | -22/+66 |