Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | wincred: avoid overwriting configured variablessk/wincred | Pat Thoyts | 2014-05-14 | 1 | -4/+4 | |
| * | | | | | | | | wincred: add install target | Pat Thoyts | 2014-05-14 | 1 | -0/+8 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | 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 'cc/replace-edit' | Junio C Hamano | 2014-06-16 | 3 | -46/+222 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Documentation: replace: describe new --edit option | Christian Couder | 2014-05-19 | 1 | -1/+15 | |
| * | | | | | | | | replace: add --edit to usage string | Christian Couder | 2014-05-19 | 1 | -0/+1 | |
| * | | | | | | | | replace: add tests for --edit | Christian Couder | 2014-05-19 | 1 | -0/+27 | |
| * | | | | | | | | replace: die early if replace ref already exists | Christian Couder | 2014-05-19 | 1 | -1/+4 | |
| * | | | | | | | | replace: refactor checking ref validity | Christian Couder | 2014-05-19 | 1 | -11/+20 | |
| * | | | | | | | | replace: make sure --edit results in a different object | Christian Couder | 2014-05-19 | 1 | -0/+3 | |
| * | | | | | | | | replace: add --edit option | Jeff King | 2014-04-29 | 1 | -1/+111 | |
| * | | | | | | | | replace: factor object resolution out of replace_object | Jeff King | 2014-04-29 | 1 | -8/+18 | |
| * | | | | | | | | replace: use OPT_CMDMODE to handle modes | Jeff King | 2014-04-29 | 1 | -24/+25 | |
| * | | | | | | | | replace: refactor command-mode determination | Jeff King | 2014-04-29 | 1 | -8/+6 | |
* | | | | | | | | | Merge branch 'mt/patch-id-stable' (early part) | Junio C Hamano | 2014-06-16 | 5 | -31/+208 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | patch-id-test: test stable and unstable behaviour | Michael S. Tsirkin | 2014-06-10 | 1 | -11/+91 | |
| * | | | | | | | | | patch-id: make it stable against hunk reordering | Michael S. Tsirkin | 2014-06-10 | 2 | -20/+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 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Sync with maint | Junio C Hamano | 2014-06-12 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint | Junio C Hamano | 2014-06-12 | 2 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | pull: do not abuse 'break' inside a shell 'case' | Jacek Konieczny | 2014-06-12 | 1 | -2/+0 | |
* | | | | | | | | | | | Update draft release notes to 2.1 | Junio C Hamano | 2014-06-09 | 1 | -2/+29 | |
* | | | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude' | Junio C Hamano | 2014-06-09 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-exclude | Junio C Hamano | 2014-06-04 | 2 | -0/+7 | |
* | | | | | | | | | | | | Merge branch 'mn/sideband-no-ansi' | Junio C Hamano | 2014-06-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | sideband.c: do not use ANSI control sequence on non-terminalmn/sideband-no-ansi | Michael Naumov | 2014-06-02 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'rs/mailinfo-header-cmp' | Junio C Hamano | 2014-06-09 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | mailinfo: use strcmp() for string comparisonrs/mailinfo-header-cmp | René Scharfe | 2014-06-02 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces' | Junio C Hamano | 2014-06-09 | 2 | -15/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-02 | 2 | -15/+42 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | 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 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-words | Jeff King | 2014-06-04 | 2 | -0/+7 | |
* | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | Second batch for 2.1 | Junio C Hamano | 2014-06-06 | 1 | -0/+87 | |
* | | | | | | | | | | | | | | Merge branch 'ss/howto-manage-trunk' | Junio C Hamano | 2014-06-06 | 2 | -0/+217 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | How to keep a project's canonical history correct.ss/howto-manage-trunk | Stephen P. Smith | 2014-05-28 | 2 | -0/+217 | |
* | | | | | | | | | | | | | | | Merge branch 'mc/git-p4-prepare-p4-only' | Junio C Hamano | 2014-06-06 | 2 | -24/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | git-p4: Do not include diff in spec file when just preparing p4mc/git-p4-pre-are-p4-only | Maxime Coste | 2014-05-27 | 2 | -24/+28 | |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | 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 | 5 | -5/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-vars | Junio C Hamano | 2014-05-23 | 2 | -2/+10 | |
| * | | | | | | | | | | | | | | | scripts: "export VAR=VALUE" construct is not portable | Elia Pinto | 2014-05-23 | 3 | -3/+6 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jj/command-line-adjective' | Junio C Hamano | 2014-06-06 | 19 | -47/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Documentation: use "command-line" when used as a compound adjective, and fix ...jj/command-line-somethingjj/command-line-adjective | Jason St. John | 2014-05-21 | 19 | -47/+47 |