summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* rev-parse: match @{upstream}, @{u} and @{push} case-insensitivelyab/case-insensitive-upstream-and-push-markerÆvar Arnfjörð Bjarmason2017-03-272-6/+17
* Merge branch 'jk/sha1dc'Junio C Hamano2017-03-242-0/+19
|\
| * t0013: add a basic sha1 collision detection testJeff King2017-03-172-0/+19
* | Merge branch 'sg/test-with-stdin'Junio C Hamano2017-03-242-8/+4
|\ \
| * | tests: make the 'test_pause' helper work in non-verbose modesg/test-with-stdinSZEDER Gábor2017-03-181-7/+2
| * | tests: create an interactive gdb session with the 'debug' helperSZEDER Gábor2017-03-182-1/+2
| * | Merge branch 'js/realpath-pathdup-fix' into maintJunio C Hamano2017-03-161-0/+8
| |\ \
| * \ \ Merge branch 'ax/line-log-range-merge-fix' into maintJunio C Hamano2017-03-161-0/+10
| |\ \ \
| * \ \ \ Merge branch 'jk/add-i-patch-do-prompt' into maintJunio C Hamano2017-03-161-0/+18
| |\ \ \ \
* | \ \ \ \ Merge branch 'js/regexec-buf'Junio C Hamano2017-03-241-0/+5
|\ \ \ \ \ \
| * | | | | | pickaxe: fix segfault with '-S<...> --pickaxe-regex'js/regexec-bufSZEDER Gábor2017-03-181-0/+5
* | | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache'Junio C Hamano2017-03-241-0/+93
|\ \ \ \ \ \ \
| * | | | | | | credential-cache: add tests for XDG functionalityDevin Lehmacher2017-03-171-0/+93
* | | | | | | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-03-211-1/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | config: add conditional includeNguyễn Thái Ngọc Duy2017-03-111-1/+57
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-03-201-2/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: handle modified symlinks in dir-diff modeDavid Aguilar2017-03-151-0/+60
| * | | | | | | | t7800: cleanup cruft left behind by testsDavid Aguilar2017-03-151-1/+4
| * | | | | | | | t7800: remove whitespace before redirectDavid Aguilar2017-03-151-1/+1
* | | | | | | | | Merge branch 'jk/cherry-pick-0-mainline'Junio C Hamano2017-03-171-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainlineJeff King2017-03-151-0/+9
* | | | | | | | | | Merge branch 'js/early-config'Junio C Hamano2017-03-173-4/+103
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1309: document cases where we would want early config not to die()Johannes Schindelin2017-03-141-0/+24
| * | | | | | | | | | t1309: test read_early_config()Johannes Schindelin2017-03-142-0/+65
| * | | | | | | | | | read_early_config(): really discover .git/Johannes Schindelin2017-03-141-4/+4
| * | | | | | | | | | t7006: replace dubious testJohannes Schindelin2017-03-031-1/+11
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/add-i-use-pathspecs'Junio C Hamano2017-03-171-0/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add--interactive: do not expand pathspecs with ls-filesjk/add-i-use-pathspecsJeff King2017-03-141-0/+43
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bw/attr-pathspec'Junio C Hamano2017-03-171-0/+200
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pathspec: allow escaped query valuesBrandon Williams2017-03-131-0/+19
| * | | | | | | | | | pathspec: allow querying for attributesBrandon Williams2017-03-131-0/+181
* | | | | | | | | | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-03-171-0/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-parse: add --show-superproject-working-treeStefan Beller2017-03-081-0/+14
* | | | | | | | | | | | Merge branch 'jk/interop-test'Junio C Hamano2017-03-177-1/+267
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/interop: add test of old clients against modern git-daemonjk/interop-testJeff King2017-03-102-1/+43
| * | | | | | | | | | | | t: add an interoperability test harnessJeff King2017-03-105-0/+224
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cc/split-index-config'Junio C Hamano2017-03-171-85/+239
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | read-cache: use freshen_shared_index() in read_index_from()Christian Couder2017-03-061-7/+7
| * | | | | | | | | | | | t1700: test shared index file expirationChristian Couder2017-03-061-0/+44
| * | | | | | | | | | | | t1700: add tests for splitIndex.maxPercentChangeChristian Couder2017-03-011-0/+72
| * | | | | | | | | | | | read-cache: regenerate shared index if necessaryChristian Couder2017-03-011-0/+1
| * | | | | | | | | | | | t1700: add tests for core.splitIndexChristian Couder2017-03-011-0/+37
| * | | | | | | | | | | | t1700: change here document styleChristian Couder2017-03-011-85/+85
* | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-03-141-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch: honor --abbrev/--no-abbrev in --list modeJunio C Hamano2017-03-101-0/+25
* | | | | | | | | | | | | | Merge branch 'dp/filter-branch-prune-empty'Junio C Hamano2017-03-142-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | p7000: add test for filter-branch with --prune-emptydp/filter-branch-prune-emptyDevin J. Pohly2017-03-031-0/+5
| * | | | | | | | | | | | | | filter-branch: fix --prune-empty on parentless commitsDevin J. Pohly2017-03-031-2/+2
| * | | | | | | | | | | | | | t7003: ensure --prune-empty removes entire branch when applicableDevin J. Pohly2017-03-031-0/+7
| * | | | | | | | | | | | | | t7003: ensure --prune-empty can prune root commitDevin J. Pohly2017-03-031-0/+30