Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/apply-recount-allow-noop' | Junio C Hamano | 2018-11-18 | 1 | -0/+12 |
|\ | |||||
| * | apply --recount: allow "no-op hunks" | Johannes Schindelin | 2018-11-13 | 1 | -0/+12 |
* | | Merge branch 'ra/rev-parse-exclude-glob' | Junio C Hamano | 2018-11-18 | 1 | -3/+57 |
|\ \ | |||||
| * | | refs: fix some exclude patterns being ignored | Rafael Ascensão | 2018-11-13 | 1 | -12/+12 |
| * | | refs: show --exclude failure with --branches/tags/remotes=glob | Rafael Ascensão | 2018-11-13 | 1 | -3/+57 |
| |/ | |||||
* | | Merge branch 'js/rebase-autostash-detach-fix' | Junio C Hamano | 2018-11-18 | 1 | -0/+8 |
|\ \ | |||||
| * | | built-in rebase --autostash: leave the current branch alone if possible | Johannes Schindelin | 2018-11-08 | 1 | -1/+1 |
| * | | built-in rebase: demonstrate regression with --autostash | Johannes Schindelin | 2018-11-08 | 1 | -0/+8 |
* | | | Merge branch 'ab/range-diff-no-patch' | Junio C Hamano | 2018-11-18 | 1 | -0/+30 |
|\ \ \ | |||||
| * | | | range-diff: make diff option behavior (e.g. --stat) consistent | Ævar Arnfjörð Bjarmason | 2018-11-14 | 1 | -23/+0 |
| * | | | range-diff: fix regression in passing along diff options | Ævar Arnfjörð Bjarmason | 2018-11-12 | 1 | -0/+53 |
* | | | | Merge branch 'jk/verify-sig-merge-into-void' | Junio C Hamano | 2018-11-18 | 2 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | pull: handle --verify-signatures for unborn branch | Jeff King | 2018-11-07 | 1 | -0/+7 |
| * | | | | merge: handle --verify-signatures for unborn branch | Jeff King | 2018-11-07 | 1 | -0/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/unused-parameter-fixes' | Junio C Hamano | 2018-11-18 | 2 | -23/+1 |
|\ \ \ \ | |||||
| * | | | | assert NOARG/NONEG behavior of parse-options callbacks | Jeff King | 2018-11-06 | 1 | -0/+1 |
| * | | | | parse-options: drop OPT_DATE() | Jeff King | 2018-11-06 | 2 | -23/+0 |
* | | | | | Merge branch 'mg/gpg-fingerprint-test' | Junio C Hamano | 2018-11-18 | 2 | -14/+70 |
|\ \ \ \ \ | |||||
| * | | | | | t/t7510-signed-commit.sh: add signing subkey to Eris Discordia key | Michał Górny | 2018-11-05 | 2 | -9/+59 |
| * | | | | | t/t7510-signed-commit.sh: Add %GP to custom format checks | Michał Górny | 2018-11-05 | 1 | -6/+12 |
* | | | | | | Merge branch 'ds/reachable-topo-order' | Junio C Hamano | 2018-11-18 | 4 | -21/+160 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t6012: make rev-list tests more interesting | Derrick Stolee | 2018-11-02 | 1 | -9/+36 |
| * | | | | | | test-reach: add rev-list tests | Derrick Stolee | 2018-11-02 | 1 | -0/+84 |
| * | | | | | | test-reach: add run_three_modes method | Derrick Stolee | 2018-11-02 | 1 | -4/+8 |
| * | | | | | | prio-queue: add 'peek' operation | Derrick Stolee | 2018-11-02 | 2 | -8/+32 |
* | | | | | | | Merge branch 'nd/tree-walk-path-exclusion' | Junio C Hamano | 2018-11-13 | 1 | -0/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tree-walk.c: fix overoptimistic inclusion in :(exclude) matching | Nguyễn Thái Ngọc Duy | 2018-11-05 | 1 | -0/+17 |
* | | | | | | | | Merge branch 'jk/misc-unused-fixes' | Junio C Hamano | 2018-11-13 | 2 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | approxidate: fix NULL dereference in date_time() | Jeff King | 2018-11-07 | 1 | -0/+1 |
| * | | | | | | | | approxidate: handle pending number for "specials" | Jeff King | 2018-11-02 | 1 | -0/+1 |
| * | | | | | | | | rev-list: handle flags for --indexed-objects | Jeff King | 2018-11-02 | 1 | -0/+7 |
* | | | | | | | | | Merge branch 'nd/per-worktree-ref-iteration' | Junio C Hamano | 2018-11-13 | 4 | -0/+131 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | reflog expire: cover reflog from all worktrees | Nguyễn Thái Ngọc Duy | 2018-10-22 | 1 | -0/+15 |
| * | | | | | | | | | fsck: check HEAD and reflog from other worktrees | Nguyễn Thái Ngọc Duy | 2018-10-22 | 1 | -0/+35 |
| * | | | | | | | | | refs: new ref types to make per-worktree refs visible to all worktrees | Nguyễn Thái Ngọc Duy | 2018-10-22 | 1 | -0/+46 |
| * | | | | | | | | | Add a place for (not) sharing stuff between worktrees | Nguyễn Thái Ngọc Duy | 2018-10-07 | 2 | -0/+35 |
* | | | | | | | | | | Merge branch 'al/send-email-auto-cte-fixup' | Junio C Hamano | 2018-11-13 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | send-email: avoid empty transfer encoding header | Aaron Lindsay | 2018-11-02 | 1 | -0/+15 |
* | | | | | | | | | | | Merge branch 'ds/add-missing-tags' | Junio C Hamano | 2018-11-13 | 2 | -4/+82 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test-reach: test get_reachable_subset | Derrick Stolee | 2018-11-03 | 2 | -4/+82 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'js/rebase-p-tests' | Junio C Hamano | 2018-11-13 | 14 | -43/+78 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tests: optionally skip `git rebase -p` tests | Johannes Schindelin | 2018-11-02 | 14 | -36/+69 |
| * | | | | | | | | | | | t3418: decouple test cases from a previous `rebase -p` test case | Johannes Schindelin | 2018-11-02 | 1 | -0/+1 |
| * | | | | | | | | | | | t3404: decouple some test cases from outcomes of previous test cases | Johannes Schindelin | 2018-11-02 | 1 | -7/+8 |
* | | | | | | | | | | | | Merge branch 'ag/rev-parse-all-exclude-fix' | Junio C Hamano | 2018-11-13 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rev-parse: clear --exclude list after 'git rev-parse --all' | Andreas Gruenbacher | 2018-11-01 | 1 | -0/+12 |
* | | | | | | | | | | | | | Merge branch 'jt/tighten-fetch-proto-v2-response' | Junio C Hamano | 2018-11-13 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fetch-pack: be more precise in parsing v2 response | Jonathan Tan | 2018-11-01 | 1 | -0/+50 |
* | | | | | | | | | | | | | | Merge branch 'ao/submodule-wo-gitmodules-checked-out' | Junio C Hamano | 2018-11-13 | 7 | -16/+298 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t/helper: add test-submodule-nested-repo-config | Antonio Ospite | 2018-10-31 | 4 | -0/+66 |