Home
last modified time | relevance | path

Searched full:merge (Results 1 – 25 of 67) sorted by relevance

123

/dokuwiki/vendor/geshi/geshi/src/geshi/
H A Dbash.php189 'git filter-branch', 'git fmt-merge-msg', 'git for-each-ref',
196 'git merge', 'git merge-base', 'git merge-file', 'git merge-index',
197 'git merge-octopus', 'git merge-one-file', 'git merge-ours',
198 'git merge-recursive', 'git merge-resolve', 'git merge-subtree',
199 'git mergetool', 'git merge-tree', 'git mktag', 'git mktree',
230 'git-fmt-merge-msg', 'git-for-each-ref', 'git-format-patch',
236 'git-mailinfo', 'git-mailsplit', 'git-merge', 'git-merge-base',
237 'git-merge-file', 'git-merge-index', 'git-merge-octopus',
238 'git-merge-one-file', 'git-merge-ours', 'git-merge-recursive',
239 'git-merge-resolve', 'git-merge-subtree', 'git-mergetool',
[all …]
H A Dlocobasic.php55 "LOCATE", "MASK", "MEMORY", "MERGE", "MODE", "MOVE", "MOVER", "NEW",
/dokuwiki/vendor/paragonie/constant_time_encoding/
H A DLICENSE.txt8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
34 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/_test/tests/inc/
H A Dparserutils_set_metadata.test.php44 * test array merge, including contributors with numeric keys and array data overwritting
72 … $this->assertNotEquals($last_edit_date, $meta['date']['modified'], 'First edit date merge error');
/dokuwiki/vendor/simplepie/simplepie/LICENSES/
H A DMIT.txt4 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/vendor/splitbrain/slika/
H A DLICENSE3 …estriction, including without limitation the rights to use, copy, modify, merge, publish, distribu…
/dokuwiki/vendor/splitbrain/php-cli/
H A DLICENSE8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/vendor/splitbrain/php-archive/
H A DLICENSE6 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/vendor/composer/
H A DLICENSE7 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/vendor/paragonie/random_compat/
H A DLICENSE8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/vendor/phpseclib/phpseclib/
H A DLICENSE6 without limitation the rights to use, copy, modify, merge, publish,
/dokuwiki/vendor/php81_bc/strftime/
H A DLICENSE8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/.github/workflows/
H A Drelease-preparation.yml62 - name: Create merge commit with version info
64 git merge -s ours origin/stable
/dokuwiki/vendor/paragonie/random_compat/lib/
H A Drandom.php16 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/lib/plugins/usermanager/_test/
H A DAuthPlugin.php26 // merge in given capabilities for testing
/dokuwiki/vendor/paragonie/constant_time_encoding/src/
H A DEncoderInterface.php14 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
H A DBinary.php17 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
H A DBase64DotSlashOrdered.php14 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
H A DRFC4648.php15 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
H A DBase64DotSlash.php14 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
H A DBase64UrlSafe.php14 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
H A DBase32Hex.php15 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
H A DHex.php24 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/dokuwiki/inc/Parsing/Handler/
H A DNest.php54 // merge consecutive cdata
/dokuwiki/lib/plugins/config/core/
H A DConfigParser.php50 // merge multi-dimensional array indices using the keymarker

123