Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge branch 'mt/patch-id-stable' (early part) | Junio C Hamano | 2014-06-16 | 3 | -11/+117 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | patch-id-test: test stable and unstable behaviour | Michael S. Tsirkin | 2014-06-10 | 1 | -11/+91 | |
| * | | | | | | | | | | | | | | | test doc: test_write_lines does not split its arguments | Jonathan Nieder | 2014-06-10 | 1 | -4/+3 | |
| * | | | | | | | | | | | | | | | test: add test_write_lines helper | Michael S. Tsirkin | 2014-06-10 | 2 | -0/+27 | |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude' | Junio C Hamano | 2014-06-09 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-exclude | Junio C Hamano | 2014-06-04 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces' | Junio C Hamano | 2014-06-09 | 1 | -0/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-02 | 1 | -0/+23 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' | Junio C Hamano | 2014-06-09 | 2 | -59/+100 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t5538: move http push tests out to t5542na/no-http-test-in-the-middle | Nick Alcock | 2014-05-30 | 2 | -59/+100 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-06-09 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-words | Jeff King | 2014-06-04 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'lt/request-pull' | Junio C Hamano | 2014-06-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pull | Johannes Sixt | 2014-06-02 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mc/git-p4-prepare-p4-only' | Junio C Hamano | 2014-06-06 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | git-p4: Do not include diff in spec file when just preparing p4mc/git-p4-pre-are-p4-only | Maxime Coste | 2014-05-27 | 1 | -1/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jn/test-lint-unmoor' | Junio C Hamano | 2014-06-06 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | test-lint: find unportable sed, echo, test, and export usage after &&jn/test-lint-unmoor | Jonathan Nieder | 2014-05-23 | 1 | -4/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'ep/shell-assign-and-export-vars' | Junio C Hamano | 2014-06-06 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-vars | Junio C Hamano | 2014-05-23 | 2 | -2/+10 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 2 | -2/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-char | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -0/+26 | |
| * | | | | | | | | | | | | | | | | | | | config: be strict on core.commentChar | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -2/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'mt/rebase-i-keep-empty-test' | Junio C Hamano | 2014-06-06 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | rebase --keep-empty -i: add testmt/rebase-i-keep-empty-test | Michael S. Tsirkin | 2014-05-19 | 1 | -0/+8 | |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' | Junio C Hamano | 2014-06-06 | 3 | -10/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-merges | Max Kirillov | 2014-05-15 | 3 | -10/+13 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' | Junio C Hamano | 2014-06-06 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-test | brian m. carlson | 2014-05-08 | 1 | -0/+9 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' | Junio C Hamano | 2014-06-06 | 1 | -0/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitive | David Turner | 2014-05-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 | 1 | -0/+53 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/reflog-exists' | Junio C Hamano | 2014-06-06 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | checkout.c: use ref_exists instead of file_existrs/reflog-exists | Ronnie Sahlberg | 2014-05-08 | 1 | -0/+8 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/utf8-switch-between-nfd-and-nfc' | Junio C Hamano | 2014-06-06 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | t3910: show failure of core.precomposeunicode with decomposed filenamesjk/utf8-switch-between-nfd-and-nfc | Jeff King | 2014-04-29 | 1 | -0/+10 | |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' | Junio C Hamano | 2014-06-06 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-empty | Jeff King | 2014-04-28 | 1 | -1/+10 | |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'ew/config-protect-mode' | Junio C Hamano | 2014-06-03 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | config: preserve config file permissions on editsew/config-protect-mode | Eric Wong | 2014-05-06 | 1 | -0/+10 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-06-03 | 3 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | commit: accept more date formats for "--date" | Jeff King | 2014-05-02 | 1 | -2/+10 | |
| * | | | | | | | | | | | | | | | | | | commit: print "Date" line when the user has set date | Jeff King | 2014-05-02 | 3 | -0/+18 | |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'ep/shell-command-substitution' | Junio C Hamano | 2014-06-03 | 32 | -151/+151 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | t5000-tar-tree.sh: use the $( ... ) construct for command substitutionep/shell-command-substitution | Elia Pinto | 2014-04-30 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | t4204-patch-id.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-30 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | t4119-apply-config.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | t4116-apply-reverse.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-30 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | | t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitu... | Elia Pinto | 2014-04-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | t4038-diff-combined.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-30 | 1 | -1/+1 |