Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'ls/macos-update' | Junio C Hamano | 2016-11-11 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | travis-ci: disable GIT_TEST_HTTPD for macOSls/macos-update | Lars Schneider | 2016-11-10 | 1 | -1/+2 | |
| * | | | | | | | | Makefile: set NO_OPENSSL on macOS by default | Lars Schneider | 2016-11-10 | 1 | -0/+1 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'js/prepare-sequencer' | Junio C Hamano | 2016-11-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | sequencer: silence -Wtautological-constant-out-of-range-compare | Jeff King | 2016-11-08 | 1 | -1/+1 | |
* | | | | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-11-11 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | t0021: remove debugging cruft | Junio C Hamano | 2016-11-11 | 1 | -2/+1 | |
* | | | | | | | | | Merge branch 'as/merge-attr-sleep' | Junio C Hamano | 2016-11-11 | 1 | -5/+13 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleep | Johannes Sixt | 2016-11-11 | 1 | -1/+9 | |
| * | | | | | | | | t6026: ensure that long-running script really is | Johannes Schindelin | 2016-11-10 | 1 | -4/+4 | |
| * | | | | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early" | Junio C Hamano | 2016-11-10 | 1 | -1/+1 | |
| * | | | | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called" | Junio C Hamano | 2016-11-10 | 1 | -2/+1 | |
| * | | | | | | | | t6026-merge-attr: ensure that the merge driver was called | Andreas Schwab | 2016-11-10 | 1 | -1/+2 | |
| * | | | | | | | | t6026-merge-attr: don't fail if sleep exits early | Andreas Schwab | 2016-11-08 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' | Junio C Hamano | 2016-11-10 | 2 | -1/+72 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | alternates: re-allow relative paths from environmentjk/alt-odb-cleanup | Jeff King | 2016-11-08 | 2 | -1/+72 | |
* | | | | | | | | | | Merge branch 'jk/filter-process-fix' | Junio C Hamano | 2016-11-10 | 2 | -15/+17 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t0021: fix filehandle usage on older perljk/filter-process-fix | Jeff King | 2016-11-02 | 1 | -0/+1 | |
| * | | | | | | | | | | t0021: use $PERL_PATH for rot13-filter.pl | Jeff King | 2016-11-02 | 2 | -9/+11 | |
| * | | | | | | | | | | t0021: put $TEST_ROOT in $PATH | Jeff King | 2016-11-02 | 1 | -3/+4 | |
| * | | | | | | | | | | t0021: use write_script to create rot13 shell script | Jeff King | 2016-11-02 | 1 | -3/+1 | |
* | | | | | | | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-11-10 | 1 | -5/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | t0021: compute file size with a single process instead of a pipeline | Johannes Sixt | 2016-11-08 | 1 | -1/+1 | |
| * | | | | | | | | | | t0021: expect more variations in the output of uniq -c | Johannes Sixt | 2016-11-08 | 1 | -4/+3 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | A bit of updates post -rc0 | Junio C Hamano | 2016-11-01 | 1 | -7/+8 | |
* | | | | | | | | | | Merge branch 'cc/split-index-typofix' | Junio C Hamano | 2016-11-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | split-index: s/eith/with/ typo fixcc/split-index-typofix | Christian Couder | 2016-11-01 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo' | Junio C Hamano | 2016-11-01 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | sha1_name: make wraparound of the index into ring-buffer explicit | René Scharfe | 2016-11-01 | 1 | -1/+2 | |
* | | | | | | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-11-01 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | cocci: avoid self-references in object_id transformationsrs/cocci | René Scharfe | 2016-11-01 | 1 | -0/+15 | |
* | | | | | | | | | | | Git 2.11-rc0v2.11.0-rc0 | Junio C Hamano | 2016-10-31 | 2 | -28/+42 | |
* | | | | | | | | | | | Merge branch 'nd/test-helpers' | Junio C Hamano | 2016-10-31 | 2 | -3/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | valgrind: support test helpersnd/test-helpers | René Scharfe | 2016-10-27 | 2 | -3/+18 | |
* | | | | | | | | | | | | Merge branch 'sc/fmt-merge-msg-doc-markup-fix' | Junio C Hamano | 2016-10-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fix | Stefan Christ | 2016-10-28 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ak/sh-setup-dot-source-i18n-fix' | Junio C Hamano | 2016-10-31 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | git-sh-setup: be explicit where to dot-source git-sh-i18n from.ak/sh-setup-dot-source-i18n-fix | Anders Kaseorg | 2016-10-30 | 1 | -3/+3 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'rs/commit-pptr-simplify' | Junio C Hamano | 2016-10-31 | 1 | -8/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | commit: simplify building parents listrs/commit-pptr-simplify | René Scharfe | 2016-10-30 | 1 | -8/+6 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/rebase-config-insn-fmt-docfix' | Junio C Hamano | 2016-10-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfix | Jeff King | 2016-10-30 | 1 | -1/+1 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'ak/pre-receive-hook-template-modefix' | Junio C Hamano | 2016-10-31 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | pre-receive.sample: mark it executableak/pre-receive-hook-template-modefix | Anders Kaseorg | 2016-10-28 | 1 | -0/+0 | |
* | | | | | | | | | | | | | Merge branch 'jk/common-main' | Junio C Hamano | 2016-10-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git-compat-util: move content inside ifdef/endif guards | Jeff King | 2016-10-27 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Merge branch 'aw/numbered-stash' | Junio C Hamano | 2016-10-31 | 3 | -3/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | stash: allow stashes to be referenced by index onlyaw/numbered-stash | Aaron M Watson | 2016-10-26 | 3 | -3/+50 | |
* | | | | | | | | | | | | | | | Merge branch 'jt/trailer-with-cruft' | Junio C Hamano | 2016-10-31 | 3 | -279/+654 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | trailer: support values folded to multiple lines | Jonathan Tan | 2016-10-21 | 3 | -10/+211 |