Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jl/status-added-submodule-is-never-ignored' | Junio C Hamano | 2014-06-16 |
|\ | |||
| * | commit -m: commit staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 |
| * | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 |
* | | Merge branch 'as/pretty-truncate' | Junio C Hamano | 2014-06-16 |
|\ \ | |||
| * | | pretty.c: format string with truncate respects logOutputEncoding | Alexey Shumkin | 2014-05-21 |
| * | | t4205, t6006: add tests that fail with i18n.logOutputEncoding set | Alexey Shumkin | 2014-05-21 |
| * | | t4205 (log-pretty-format): use `tformat` rather than `format` | Alexey Shumkin | 2014-05-21 |
| * | | t4041, t4205, t6006, t7102: don't hardcode tested encoding value | Alexey Shumkin | 2014-05-21 |
| * | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2014-05-19 |
* | | | Merge branch 'rr/rebase-autostash-fix' | Junio C Hamano | 2014-06-16 |
|\ \ \ | |||
| * | | | rebase -i: test "Nothing to do" case with autostash | Matthieu Moy | 2014-05-20 |
* | | | | Merge branch 'jk/diff-files-assume-unchanged' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ | |||
| * | | | | run_diff_files: do not look at uninitialized stat data | Jeff King | 2014-05-15 |
* | | | | | Merge branch 'jk/do-not-run-httpd-tests-as-root' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ | |||
| * | | | | | t/lib-httpd: require SANITY prereq | Jeff King | 2014-05-12 |
| * | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'km/avoid-bs-in-shell-glob' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'km/avoid-cp-a' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ | Merge branch 'cc/replace-edit' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | replace: add tests for --edit | Christian Couder | 2014-05-19 |
* | | | | | | | | | | Merge branch 'mt/patch-id-stable' (early part) | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | patch-id-test: test stable and unstable behaviour | Michael S. Tsirkin | 2014-06-10 |
| * | | | | | | | | | | test doc: test_write_lines does not split its arguments | Jonathan Nieder | 2014-06-10 |
| * | | | | | | | | | | test: add test_write_lines helper | Michael S. Tsirkin | 2014-06-10 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude' | Junio C Hamano | 2014-06-09 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | shortlog: allow --exclude=<glob> to be passed | Junio C Hamano | 2014-06-04 |
* | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces' | Junio C Hamano | 2014-06-09 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-02 |
* | | | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' | Junio C Hamano | 2014-06-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t5538: move http push tests out to t5542 | Nick Alcock | 2014-05-30 |
* | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-06-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argument | Jeff King | 2014-06-04 |
* | | | | | | | | | | | | | | Merge branch 'lt/request-pull' | Junio C Hamano | 2014-06-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | fix brown paper bag breakage in t5150-request-pull.sh | Johannes Sixt | 2014-06-02 |
* | | | | | | | | | | | | | | | Merge branch 'mc/git-p4-prepare-p4-only' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | git-p4: Do not include diff in spec file when just preparing p4 | Maxime Coste | 2014-05-27 |
* | | | | | | | | | | | | | | | | Merge branch 'jn/test-lint-unmoor' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | test-lint: find unportable sed, echo, test, and export usage after && | Jonathan Nieder | 2014-05-23 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge branch 'ep/shell-assign-and-export-vars' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | scripts: more "export VAR=VALUE" fixes | Junio C Hamano | 2014-05-23 |
| |/ / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | commit: allow core.commentChar=auto for character auto selection | Nguyễn Thái Ngọc Duy | 2014-05-19 |
| * | | | | | | | | | | | | | | | | config: be strict on core.commentChar | Nguyễn Thái Ngọc Duy | 2014-05-19 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge branch 'mt/rebase-i-keep-empty-test' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | rebase --keep-empty -i: add test | Michael S. Tsirkin | 2014-05-19 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commit | Max Kirillov | 2014-05-15 |
| |/ / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | blame: correctly handle files regardless of autocrlf | brian m. carlson | 2014-05-08 |
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' | Junio C Hamano | 2014-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |