Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | hash-object: fix buffer reuse with --path in a subdirectory | Jeff King | 2017-03-21 | 1 | -0/+10 |
* | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-03-20 | 1 | -2/+65 |
|\ | |||||
| * | difftool: handle modified symlinks in dir-diff mode | David Aguilar | 2017-03-15 | 1 | -0/+60 |
| * | t7800: cleanup cruft left behind by tests | David Aguilar | 2017-03-15 | 1 | -1/+4 |
| * | t7800: remove whitespace before redirect | David Aguilar | 2017-03-15 | 1 | -1/+1 |
* | | Merge branch 'jk/cherry-pick-0-mainline' | Junio C Hamano | 2017-03-17 | 1 | -0/+9 |
|\ \ | |||||
| * | | cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainline | Jeff King | 2017-03-15 | 1 | -0/+9 |
* | | | Merge branch 'js/early-config' | Junio C Hamano | 2017-03-17 | 3 | -4/+103 |
|\ \ \ | |||||
| * | | | t1309: document cases where we would want early config not to die() | Johannes Schindelin | 2017-03-14 | 1 | -0/+24 |
| * | | | t1309: test read_early_config() | Johannes Schindelin | 2017-03-14 | 2 | -0/+65 |
| * | | | read_early_config(): really discover .git/ | Johannes Schindelin | 2017-03-14 | 1 | -4/+4 |
| * | | | t7006: replace dubious test | Johannes Schindelin | 2017-03-03 | 1 | -1/+11 |
* | | | | Merge branch 'jk/add-i-use-pathspecs' | Junio C Hamano | 2017-03-17 | 1 | -0/+43 |
|\ \ \ \ | |||||
| * | | | | add--interactive: do not expand pathspecs with ls-filesjk/add-i-use-pathspecs | Jeff King | 2017-03-14 | 1 | -0/+43 |
| |/ / / | |||||
* | | | | Merge branch 'bw/attr-pathspec' | Junio C Hamano | 2017-03-17 | 1 | -0/+200 |
|\ \ \ \ | |||||
| * | | | | pathspec: allow escaped query values | Brandon Williams | 2017-03-13 | 1 | -0/+19 |
| * | | | | pathspec: allow querying for attributes | Brandon Williams | 2017-03-13 | 1 | -0/+181 |
* | | | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-03-17 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | rev-parse: add --show-superproject-working-tree | Stefan Beller | 2017-03-08 | 1 | -0/+14 |
* | | | | | | Merge branch 'jk/interop-test' | Junio C Hamano | 2017-03-17 | 7 | -1/+267 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/interop: add test of old clients against modern git-daemonjk/interop-test | Jeff King | 2017-03-10 | 2 | -1/+43 |
| * | | | | | | t: add an interoperability test harness | Jeff King | 2017-03-10 | 5 | -0/+224 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'cc/split-index-config' | Junio C Hamano | 2017-03-17 | 1 | -85/+239 |
|\ \ \ \ \ \ | |||||
| * | | | | | | read-cache: use freshen_shared_index() in read_index_from() | Christian Couder | 2017-03-06 | 1 | -7/+7 |
| * | | | | | | t1700: test shared index file expiration | Christian Couder | 2017-03-06 | 1 | -0/+44 |
| * | | | | | | t1700: add tests for splitIndex.maxPercentChange | Christian Couder | 2017-03-01 | 1 | -0/+72 |
| * | | | | | | read-cache: regenerate shared index if necessary | Christian Couder | 2017-03-01 | 1 | -0/+1 |
| * | | | | | | t1700: add tests for core.splitIndex | Christian Couder | 2017-03-01 | 1 | -0/+37 |
| * | | | | | | t1700: change here document style | Christian Couder | 2017-03-01 | 1 | -85/+85 |
* | | | | | | | Merge branch 'kn/ref-filter-branch-list' | Junio C Hamano | 2017-03-14 | 1 | -0/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch: honor --abbrev/--no-abbrev in --list mode | Junio C Hamano | 2017-03-10 | 1 | -0/+25 |
* | | | | | | | | Merge branch 'dp/filter-branch-prune-empty' | Junio C Hamano | 2017-03-14 | 2 | -0/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | p7000: add test for filter-branch with --prune-emptydp/filter-branch-prune-empty | Devin J. Pohly | 2017-03-03 | 1 | -0/+5 |
| * | | | | | | | | filter-branch: fix --prune-empty on parentless commits | Devin J. Pohly | 2017-03-03 | 1 | -2/+2 |
| * | | | | | | | | t7003: ensure --prune-empty removes entire branch when applicable | Devin J. Pohly | 2017-03-03 | 1 | -0/+7 |
| * | | | | | | | | t7003: ensure --prune-empty can prune root commit | Devin J. Pohly | 2017-03-03 | 1 | -0/+30 |
* | | | | | | | | | Merge branch 'jt/perf-updates' | Junio C Hamano | 2017-03-14 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t/perf: add fallback for pre-bin-wrappers versions of gitjt/perf-updates | Jeff King | 2017-03-03 | 1 | -0/+3 |
| * | | | | | | | | | t/perf: use $MODERN_GIT for all repo-copying steps | Jeff King | 2017-03-03 | 1 | -2/+2 |
| * | | | | | | | | | t/perf: export variable used in other blocks | Jonathan Tan | 2017-03-03 | 1 | -1/+2 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' | Junio C Hamano | 2017-03-14 | 2 | -4/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fetch-pack: add specific error for fetching an unadvertised objectmm/fetch-show-error-message-on-unadvertised-object | Matt McCutchen | 2017-03-02 | 1 | -1/+1 |
| * | | | | | | | | | fetch_refs_via_pack: call report_unmatched_refs | Matt McCutchen | 2017-03-02 | 1 | -1/+2 |
| * | | | | | | | | | fetch-pack: move code to report unmatched refs to a function | Matt McCutchen | 2017-03-02 | 1 | -3/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/interpret-branch-name' | Junio C Hamano | 2017-03-14 | 2 | -0/+141 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: restrict @-expansions when finding branchjk/interpret-branch-name | Jeff King | 2017-03-02 | 1 | -0/+10 |
| * | | | | | | | | | strbuf_check_ref_format(): expand only local branches | Jeff King | 2017-03-02 | 1 | -2/+2 |
| * | | | | | | | | | branch: restrict @-expansions when deleting | Jeff King | 2017-03-02 | 1 | -3/+3 |
| * | | | | | | | | | t3204: test git-branch @-expansion corner cases | Jeff King | 2017-03-02 | 1 | -0/+123 |
| * | | | | | | | | | interpret_branch_name(): handle auto-namelen for @{-1} | Jeff King | 2017-03-02 | 1 | -0/+8 |
| |/ / / / / / / / |