Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Convert sha1_array_lookup to take struct object_id | brian m. carlson | 2017-03-31 | 1 | -1/+1 |
* | Make sha1_array_append take a struct object_id * | brian m. carlson | 2017-03-31 | 1 | -1/+1 |
* | test-sha1-array: convert most code to struct object_id | brian m. carlson | 2017-03-28 | 1 | -5/+5 |
* | Merge branch 'jk/sha1dc' | Junio C Hamano | 2017-03-24 | 2 | -0/+19 |
|\ | |||||
| * | t0013: add a basic sha1 collision detection test | Jeff King | 2017-03-17 | 2 | -0/+19 |
* | | Merge branch 'sg/test-with-stdin' | Junio C Hamano | 2017-03-24 | 2 | -8/+4 |
|\ \ | |||||
| * | | tests: make the 'test_pause' helper work in non-verbose modesg/test-with-stdin | SZEDER Gábor | 2017-03-18 | 1 | -7/+2 |
| * | | tests: create an interactive gdb session with the 'debug' helper | SZEDER Gábor | 2017-03-18 | 2 | -1/+2 |
| * | | Merge branch 'js/realpath-pathdup-fix' into maint | Junio C Hamano | 2017-03-16 | 1 | -0/+8 |
| |\ \ | |||||
| * \ \ | Merge branch 'ax/line-log-range-merge-fix' into maint | Junio C Hamano | 2017-03-16 | 1 | -0/+10 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/add-i-patch-do-prompt' into maint | Junio C Hamano | 2017-03-16 | 1 | -0/+18 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'js/regexec-buf' | Junio C Hamano | 2017-03-24 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pickaxe: fix segfault with '-S<...> --pickaxe-regex'js/regexec-buf | SZEDER Gábor | 2017-03-18 | 1 | -0/+5 |
* | | | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache' | Junio C Hamano | 2017-03-24 | 1 | -0/+93 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | credential-cache: add tests for XDG functionality | Devin Lehmacher | 2017-03-17 | 1 | -0/+93 |
* | | | | | | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-03-21 | 1 | -1/+57 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: add conditional include | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -1/+57 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | 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 |