Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | for-each-ref: add '--merged' and '--no-merged' options | Karthik Nayak | 2015-08-03 | 1 | -0/+23 |
* | for-each-ref: add '--points-at' option | Karthik Nayak | 2015-08-03 | 1 | -0/+20 |
* | t6302: for-each-ref tests for ref-filter APIs | Karthik Nayak | 2015-08-03 | 1 | -0/+26 |
* | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' | Junio C Hamano | 2015-06-11 | 1 | -0/+15 |
|\ | |||||
| * | silence broken link warnings with revs->ignore_missing_links | Jeff King | 2015-06-01 | 1 | -0/+15 |
* | | Merge branch 'pt/pull-tests' | Junio C Hamano | 2015-06-11 | 2 | -36/+175 |
|\ \ | |||||
| * | | t5520: check reflog action in fast-forward mergept/pull-tests | Paul Tan | 2015-05-29 | 1 | -3/+10 |
| * | | t5521: test --dry-run does not make any changes | Paul Tan | 2015-05-29 | 1 | -0/+13 |
| * | | t5520: test --rebase failure on unborn branch with index | Paul Tan | 2015-05-29 | 1 | -0/+15 |
| * | | t5520: test --rebase with multiple branches | Paul Tan | 2015-05-29 | 1 | -0/+9 |
| * | | t5520: test work tree fast-forward when fetch updates head | Paul Tan | 2015-05-29 | 1 | -0/+21 |
| * | | t5520: test for failure if index has unresolved entries | Paul Tan | 2015-05-29 | 1 | -0/+19 |
| * | | t5520: test no merge candidates cases | Paul Tan | 2015-05-18 | 1 | -0/+55 |
| * | | t5520: prevent field splitting in content comparisons | Paul Tan | 2015-05-18 | 1 | -35/+35 |
* | | | Merge branch 'mh/verify-lock-error-report' | Junio C Hamano | 2015-06-11 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-report | Michael Haggerty | 2015-05-27 | 1 | -7/+7 |
* | | | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | 1 | -238/+270 |
|\ \ \ \ | |||||
| * | | | | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-26 | 1 | -0/+96 |
| * | | | | t4015: separate common setup and per-test expectation | Junio C Hamano | 2015-05-26 | 1 | -12/+13 |
| * | | | | t4015: modernise style | Junio C Hamano | 2015-05-26 | 1 | -238/+173 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'ld/p4-editor-multi-words' | Junio C Hamano | 2015-06-05 | 4 | -6/+46 |
|\ \ \ \ | |||||
| * | | | | git-p4: tests: use test-chmtime in place of touchld/p4-editor-multi-words | Luke Diamand | 2015-05-26 | 2 | -5/+7 |
| * | | | | git-p4: fix handling of multi-word P4EDITOR | Luke Diamand | 2015-05-24 | 2 | -2/+2 |
| * | | | | git-p4: add failing test for P4EDITOR handling | Luke Diamand | 2015-05-24 | 1 | -0/+38 |
* | | | | | Merge branch 'jk/at-push-sha1' | Junio C Hamano | 2015-06-05 | 3 | -5/+79 |
|\ \ \ \ \ | |||||
| * | | | | | for-each-ref: accept "%(push)" formatjk/at-push-sha1 | Jeff King | 2015-05-22 | 1 | -1/+12 |
| * | | | | | sha1_name: implement @{push} shorthand | Jeff King | 2015-05-22 | 1 | -0/+63 |
| * | | | | | remote.c: report specific errors from branch_get_upstream | Jeff King | 2015-05-21 | 1 | -4/+4 |
* | | | | | | Merge branch 'mm/rebase-i-post-rewrite-exec' | Junio C Hamano | 2015-06-01 | 1 | -36/+53 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-exec | Junio C Hamano | 2015-05-22 | 1 | -40/+40 |
| * | | | | | | rebase -i: fix post-rewrite hook with failed exec command | Matthieu Moy | 2015-05-22 | 1 | -1/+1 |
| * | | | | | | rebase -i: demonstrate incorrect behavior of post-rewrite | Matthieu Moy | 2015-05-22 | 1 | -0/+17 |
* | | | | | | | Merge branch 'fm/fetch-raw-sha1' | Junio C Hamano | 2015-06-01 | 1 | -0/+55 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | upload-pack: optionally allow fetching reachable sha1fm/fetch-raw-sha1 | Fredrik Medley | 2015-05-22 | 1 | -0/+55 |
* | | | | | | | | Merge branch 'dt/cat-file-follow-symlinks' | Junio C Hamano | 2015-06-01 | 1 | -0/+206 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinks | David Turner | 2015-05-20 | 1 | -0/+205 |
* | | | | | | | | | Merge branch 'jk/stash-options' | Junio C Hamano | 2015-06-01 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | stash: complain about unknown flags | Jeff King | 2015-05-20 | 1 | -0/+4 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jh/filter-empty-contents' | Junio C Hamano | 2015-06-01 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contents | Jim Hill | 2015-05-18 | 1 | -0/+26 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/http-backend-deadlock' | Junio C Hamano | 2015-06-01 | 1 | -13/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlock | Junio C Hamano | 2015-05-25 | 1 | -13/+36 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3 | Junio C Hamano | 2015-05-25 | 1 | -13/+36 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2 | Jeff King | 2015-05-25 | 1 | -0/+11 |
| | | * | | | | | | | | t5551: factor out tag creation | Jeff King | 2015-05-20 | 1 | -13/+21 |
| | | | |/ / / / / / | | | |/| | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-27 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | t7063: hide stderr from setup inside prereq | Jeff King | 2015-05-27 | 1 | -2/+6 |
* | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-26 | 1 | -0/+353 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | t7063: tests for untracked cache | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+353 |
* | | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' | Junio C Hamano | 2015-05-26 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ |