summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:27 -0700
commit2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5 (patch)
treec55e0b1fe1bdcf6fcdebefa9d1eb04550e3738d6 /t/t1000-read-tree-m-3way.sh
parentMerge branch 'js/check-attr-cached' (diff)
parentgit-remote-mediawiki: allow a domain to be set for authentication (diff)
downloadtgif-2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5.tar.xz
Merge branch 'mm/mediawiki-as-a-remote'
* mm/mediawiki-as-a-remote: git-remote-mediawiki: allow a domain to be set for authentication git-remote-mediawiki: obey advice.pushNonFastForward git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts git-remote-mediawiki: trivial fixes git-remote-mediawiki: allow push to set MediaWiki metadata Add a remote helper to interact with mediawiki (fetch & push)
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions