Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jl/status-added-submodule-is-never-ignored' | Junio C Hamano | 2014-06-16 | 1 | -2/+72 |
|\ | |||||
| * | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignored | Jens Lehmann | 2014-04-07 | 1 | -1/+1 |
| * | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 1 | -2/+72 |
* | | Merge branch 'as/pretty-truncate' | Junio C Hamano | 2014-06-16 | 4 | -71/+276 |
|\ \ | |||||
| * | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncate | Alexey Shumkin | 2014-05-21 | 2 | -7/+7 |
| * | | t4205, t6006: add tests that fail with i18n.logOutputEncoding set | Alexey Shumkin | 2014-05-21 | 2 | -2/+213 |
| * | | t4205 (log-pretty-format): use `tformat` rather than `format` | Alexey Shumkin | 2014-05-21 | 1 | -39/+13 |
| * | | t4041, t4205, t6006, t7102: don't hardcode tested encoding value | Alexey Shumkin | 2014-05-21 | 4 | -27/+39 |
| * | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2014-05-19 | 1 | -3/+11 |
* | | | Merge branch 'rr/rebase-autostash-fix' | Junio C Hamano | 2014-06-16 | 1 | -0/+15 |
|\ \ \ | |||||
| * | | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fix | Matthieu Moy | 2014-05-20 | 1 | -0/+15 |
* | | | | Merge branch 'jk/diff-files-assume-unchanged' | Junio C Hamano | 2014-06-16 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchanged | Jeff King | 2014-05-15 | 1 | -0/+11 |
* | | | | | Merge branch 'jk/do-not-run-httpd-tests-as-root' | Junio C Hamano | 2014-06-16 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | t/lib-httpd: require SANITY prereqjk/do-not-run-httpd-tests-as-root | Jeff King | 2014-05-12 | 1 | -0/+5 |
| * | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 | 1 | -22/+22 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'km/avoid-bs-in-shell-glob' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'km/avoid-cp-a' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'cc/replace-edit' | Junio C Hamano | 2014-06-16 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | replace: add tests for --edit | Christian Couder | 2014-05-19 | 1 | -0/+27 |
* | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |