Search code, repositories, users, issues, pull requests...

authored and

Git for Windows Build Agent

committed

hash algorithms: use size_t for section lengths

authored and

Git for Windows Build Agent

committed

mingw: only enable the MSYS2-specific stuff when compiling in MSYS2

authored and

Git for Windows Build Agent

committed

mingw: demonstrate a `git add` issue with NTFS junctions

authored and

Git for Windows Build Agent

committed

cmake: allow building for Windows/ARM64

authored and

Git for Windows Build Agent

committed

.gitignore: add Visual Studio CMakeSetting.json file

authored and

Git for Windows Build Agent

committed

hash-object --stdin: verify that it works with >4GB/LLP64

authored and

Git for Windows Build Agent

committed

mingw: rely on MSYS2's metadata instead of hard-coding it

authored and

Git for Windows Build Agent

committed

strbuf_realpath(): use platform-dependent API if available

authored and

Git for Windows Build Agent

committed

t5505/t5516: allow running without `.git/branches/` in the templates

authored and

Git for Windows Build Agent

committed

vcpkg_install: detect lack of Git

authored and

Git for Windows Build Agent

committed

ci(vs-build) also build Windows/ARM64 artifacts

authored and

Git for Windows Build Agent

committed

subtree: update `contrib/subtree` `test` target

vdye

authored and

Git for Windows Build Agent

committed

CMakeLists: add default "x64-windows" arch for Visual Studio

authored and

Git for Windows Build Agent

committed

hash-object: add another >4GB/LLP64 test case

authored and

Git for Windows Build Agent

committed

setup: properly use "%(prefix)/" when in WSL

authored and

Git for Windows Build Agent

committed

mingw: always define `ETC_*` for MSYS2 environments

authored and

Git for Windows Build Agent

committed

mingw: implement a platform-specific `strbuf_realpath()`

authored and

Git for Windows Build Agent

committed

http: use new "best effort" strategy for Secure Channel revoke checking

authored and

Git for Windows Build Agent

committed

t5505/t5516: fix white-space around redirectors

authored and

Git for Windows Build Agent

committed

t3701: verify that we can add lots of files interactively

authored and

Git for Windows Build Agent

committed

commit: accept "scissors" with CR/LF line endings

lbonanomi

authored and

Git for Windows Build Agent

committed

t0014: fix indentation

jglathe

authored and

Git for Windows Build Agent

committed

git-gui: accommodate for intent-to-add files

authored and

Git for Windows Build Agent

committed

vcpkg_install: add comment regarding slow network connections

authored and

Git for Windows Build Agent

committed

Add schannel to curl installation

authored and

Git for Windows Build Agent

committed

cmake(): allow setting HOST_CPU for cross-compilation

authored and

Git for Windows Build Agent

committed

mingw: allow for longer paths in `parse_interpreter()`

authored and

Git for Windows Build Agent

committed

compat/vcbuild: document preferred way to build in Visual Studio

authored and

Git for Windows Build Agent

committed

http: optionally send SSL client certificate

pascalmuller

authored and

Git for Windows Build Agent

committed

ci: run `contrib/subtree` tests in CI builds

vdye

authored and

Git for Windows Build Agent

committed

CMake: show Win32 and Generator_platform build-option values

authored and

Git for Windows Build Agent

committed

hash-object: add a >4GB/LLP64 test case using filtered input

authored and

Git for Windows Build Agent

committed

compat/mingw.c: do not warn when failing to get owner

authored and

Git for Windows Build Agent

committed

mingw: $env:TERM="xterm-256color" for newer OSes

rkitover

authored and

Git for Windows Build Agent

committed

winansi: check result and Buffer before using Name

1480c1

authored and

Git for Windows Build Agent

committed

Add config option `windows.appendAtomically`

authored and

Git for Windows Build Agent

committed

mingw: change core.fsyncObjectFiles = 1 by default

authored and

Git for Windows Build Agent

committed

MinGW: link as terminal server aware

authored and

Git for Windows Build Agent

committed

Fix Windows version resources

Mortein

authored and

Git for Windows Build Agent

committed

status: fix for old-style submodules with commondir

sceptical-coder

authored and

Git for Windows Build Agent

committed

windows: skip linking `git-<command>` for built-ins

authored and

Git for Windows Build Agent

committed

max_tree_depth: lower it for clang builds in general on Windows

authored and

Git for Windows Build Agent

committed

survey: stub in new experimental 'git-survey' command

authored and

Git for Windows Build Agent

committed

survey: add command line opts to select references

Jeff Hostetler

authored and

Git for Windows Build Agent

committed

Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'

authored and

Git for Windows Build Agent

committed

survey: start pretty printing data in table form

authored and

Git for Windows Build Agent

committed

clink.pl: fix libexpatd.lib link error when using MSVC

authored and

Git for Windows Build Agent

committed

survey: add object count summary

authored and

Git for Windows Build Agent

committed

Makefile: clean up .ilk files when MSVC=1

authored and

Git for Windows Build Agent

committed

survey: summarize total sizes by object type

authored and

Git for Windows Build Agent

committed

vcbuild: add support for compiling Windows resource files

authored and

Git for Windows Build Agent

committed

survey: show progress during object walk

authored and

Git for Windows Build Agent

committed

mingw: make sure `errno` is set correctly when socket operations fail

authored and

Git for Windows Build Agent

committed

config.mak.uname: add git.rc to MSVC builds

authored and

Git for Windows Build Agent

committed

http: optionally load libcurl lazily

authored and

Git for Windows Build Agent

committed

survey: add ability to track prioritized lists

authored and

Git for Windows Build Agent

committed

compat/mingw: handle WSA errors in strerror

authored and

Git for Windows Build Agent

committed

t5563: verify that NTLM authentication works

authored and

Git for Windows Build Agent

committed

Merge 'remote-hg-prerequisites' into HEAD

authored and

Git for Windows Build Agent

committed

mingw: ensure valid CTYPE

authored and

Git for Windows Build Agent

committed

clink.pl: ignore no-stack-protector arg on MSVC=1 builds

authored and

Git for Windows Build Agent

committed

http: support lazy-loading libcurl also on Windows

authored and

Git for Windows Build Agent

committed

survey: add report of "largest" paths

authored and

Git for Windows Build Agent

committed

compat/mingw: drop outdated comment

authored and

Git for Windows Build Agent

committed

http: disallow NTLM authentication by default

authored and

Git for Windows Build Agent

committed

Merge branch 'drive-prefix'

authored and

Git for Windows Build Agent

committed

mingw: allow `git.exe` to be used instead of the "Git wrapper"

authored and

Git for Windows Build Agent

committed

clink.pl: move default linker options for MSVC=1 builds

authored and

Git for Windows Build Agent

committed

http: when loading libcurl lazily, allow for multiple SSL backends

authored and

Git for Windows Build Agent

committed

survey: add --top=<N> option and config

authored and

Git for Windows Build Agent

committed

t0301: actually test credential-cache on Windows

authored and

Git for Windows Build Agent

committed

http: warn if might have failed because of NTLM

authored and

Git for Windows Build Agent

committed

Merge branch 'dont-clean-junctions'

authored and

Git for Windows Build Agent

committed

mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

authored and

Git for Windows Build Agent

committed

cmake: install headless-git.

Berrysoft

authored and

Git for Windows Build Agent

committed

git.rc: include winuser.h

authored and

Git for Windows Build Agent

committed

mingw: do load libcurl dynamically by default

authored and

Git for Windows Build Agent

committed

Add a GitHub workflow to verify that Git/Scalar work in Nano Server

authored and

Git for Windows Build Agent

committed

mingw: suggest `windows.appendAtomically` in more cases

dsl101

authored and

Git for Windows Build Agent

committed

win32: use native ANSI sequence processing, if possible

authored and

Git for Windows Build Agent

committed

common-main.c: fflush stdout buffer upon exit

chengzhuo5

authored and

Git for Windows Build Agent

committed

t5601/t7406(mingw): do run tests with symlink support

authored and

Git for Windows Build Agent

committed

win32: ensure that `localtime_r()` is declared even in i686 builds

authored and

Git for Windows Build Agent

committed

Fallback to AppData if XDG_CONFIG_HOME is unset

ariellourenco

authored and

Git for Windows Build Agent

committed

run-command: be helpful with Git LFS fails on Windows 7

authored and

Git for Windows Build Agent

committed

revision: create mark_trees_uninteresting_dense()

authored and

Git for Windows Build Agent

committed

survey: clearly note the experimental nature in the output

authored and

Git for Windows Build Agent

committed

credential-cache: handle ECONNREFUSED gracefully

authored and

Git for Windows Build Agent

committed

reftable: do make sure to use custom allocators

authored and

Git for Windows Build Agent

committed

check-whitespace: avoid alerts about upstream commits

authored and

Git for Windows Build Agent

committed

t/t5571-prep-push-hook.sh: Add test with writing to stderr

t-b

authored and

Git for Windows Build Agent

committed

credential: advertise NTLM suppression and allow helpers to re-enable

authored and

Git for Windows Build Agent

committed

dir: do not traverse mount points

maks244

authored and

Git for Windows Build Agent

committed

ci: work around a problem with HTTP/2 vs libcurl v8.10.0

authored and

Git for Windows Build Agent

committed

Merge branch 'msys2-python'

authored and

Git for Windows Build Agent

committed

Update mimalloc to v2.2.7 (#6048)

authored and

Git for Windows Build Agent

committed

Merge pull request #2375 from assarbad/reintroduce-sideband-config

authored and

Git for Windows Build Agent

committed

Merge pull request #2488 from bmueller84/master

authored and

Git for Windows Build Agent

committed

Merge pull request #2501 from jeffhostetler/clink-debug-curl

authored and

Git for Windows Build Agent

committed

Merge pull request #2504 from dscho/access-repo-via-junction

authored and

Git for Windows Build Agent

committed

Merge pull request #2535 from dscho/schannel-revoke-best-effort

authored and

Git for Windows Build Agent

committed

Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master

authored and

Git for Windows Build Agent

committed

Merge 'add-p-many-files'

authored and

Git for Windows Build Agent

committed

Merge pull request #2714 from lbonanomi/crlf-scissors

authored and

Git for Windows Build Agent

committed

Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info

authored and

Git for Windows Build Agent

committed

Merge 'git-gui/js/intent-to-add'

authored and

Git for Windows Build Agent

committed

Merge pull request #2351 from PhilipOakley/vcpkg-tip

authored and

Git for Windows Build Agent

committed

Merge pull request #2915 from dennisameling/windows-arm64-support

authored and

Git for Windows Build Agent

committed

Merge pull request #3327 from dennisameling/fix-host-cpu

authored and

Git for Windows Build Agent

committed

Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path

authored and

Git for Windows Build Agent

committed

Merge pull request #3220 from dscho/there-is-no-vs/master-anymore

authored and

Git for Windows Build Agent

committed

Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate

authored and

Git for Windows Build Agent

committed

Merge pull request #3349 from vdye/feature/ci-subtree-tests

authored and

Git for Windows Build Agent

committed

Merge pull request #3306 from PhilipOakley/vs-sln

authored and

Git for Windows Build Agent

committed

Merge pull request #3533 from PhilipOakley/hashliteral_t

authored and

Git for Windows Build Agent

committed

Merge pull request #3791: Various fixes around `safe.directory`

authored and

Git for Windows Build Agent

committed

Merge pull request #3751 from rkitover/native-term

authored and

Git for Windows Build Agent

committed

Merge pull request #3875 from 1480c1/wine/detect_msys_tty

authored and

Git for Windows Build Agent

committed

Merge branch 'optionally-dont-append-atomically-on-windows'

authored and

Git for Windows Build Agent

committed

Merge branch 'fsync-object-files-always'

authored and

Git for Windows Build Agent

committed

Merge pull request #3942 from rimrul/mingw-tsaware

authored and

Git for Windows Build Agent

committed

Fix Windows version resources (#4092)

authored and

Git for Windows Build Agent

committed

Fix global repository field not being cleared (#4083)

authored and

Git for Windows Build Agent

committed

Skip linking the "dashed" `git-<command>`s for built-ins (#4252)

authored and

Git for Windows Build Agent

committed

Add full `mingw-w64-git` (i.e. regular MSYS2 ecosystem) support (#5971)

authored and

Git for Windows Build Agent

committed

Merge pull request #2506 from dscho/issue-2283

authored and

Git for Windows Build Agent

committed

Merge pull request #2974 from derrickstolee/maintenance-and-headless

authored and

Git for Windows Build Agent

committed

ARM64: Embed manifest properly (#4718)

authored and

Git for Windows Build Agent

committed

Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (#4410)

authored and

Git for Windows Build Agent

committed

Merge branch 'nano-server'

authored and

Git for Windows Build Agent

committed

Additional error checks for issuing the windows.appendAtomically warning (#4528)

authored and

Git for Windows Build Agent

committed

win32: use native ANSI sequence processing, if possible (#4700)

authored and

Git for Windows Build Agent

committed

common-main.c: fflush stdout buffer when exit (#4901)

authored and

Git for Windows Build Agent

committed

Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'

authored and

Git for Windows Build Agent

committed

Win32: make FILETIME conversion functions public

authored and

Git for Windows Build Agent

committed

Win32: dirent.c: Move opendir down

authored and

Git for Windows Build Agent

committed

mingw: make the dirent implementation pluggable

authored and

Git for Windows Build Agent

committed

Merge branch 'Fix-i686-build-with-GCC-v14'

authored and

Git for Windows Build Agent

committed

Win32: make the lstat implementation pluggable

authored and

Git for Windows Build Agent

committed

Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'

authored and

Git for Windows Build Agent

committed

mingw: add infrastructure for read-only file system level caches

authored and

Git for Windows Build Agent

committed

Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'

authored and

Git for Windows Build Agent

committed

mingw: add a cache below mingw's lstat and dirent implementations

authored and

Git for Windows Build Agent

committed

pack-objects: create new name-hash algorithm (#5157)

authored and

Git for Windows Build Agent

committed

fscache: load directories only once

authored and

Git for Windows Build Agent

committed

Add path walk API and its use in 'git pack-objects' (#5171)

authored and

Git for Windows Build Agent

committed

fscache: add key for GIT_TRACE_FSCACHE

authored and

Git for Windows Build Agent

committed

Add experimental 'git survey' builtin (#5174)

authored and

Git for Windows Build Agent

committed

fscache: remember not-found directories

authored and

Git for Windows Build Agent

committed

credential-cache: handle ECONNREFUSED gracefully (#5329)

authored and

Git for Windows Build Agent

committed

fscache: add a test for the dir-not-found optimization

authored and

Git for Windows Build Agent

committed

Merge branch 'reftable-vs-custom-allocators'

authored and

Git for Windows Build Agent

committed

add: use preload-index and fscache for performance

authored and

Git for Windows Build Agent

committed

Merge branch 'check-whitespace-only-downstream'

authored and

Git for Windows Build Agent

committed

dir.c: make add_excludes aware of fscache during status

authored and

Git for Windows Build Agent

committed

t/t5571-prep-push-hook.sh: Add test with writing to stderr (#6063)

authored and

Git for Windows Build Agent

committed

fscache: make fscache_enabled() public

authored and

Git for Windows Build Agent

committed

Merge branch 'disallow-ntlm-auth-by-default'

authored and

Git for Windows Build Agent

committed

dir.c: regression fix for add_excludes with fscache

authored and

Git for Windows Build Agent

committed

git-gui--askyesno: fix funny text wrapping

authored and

Git for Windows Build Agent

committed

Don't traverse mount points in `remove_dir_recurse()` (#6151)

authored and

Git for Windows Build Agent

committed

fetch-pack.c: enable fscache for stats under .git/objects

Takuto Ikuta

authored and

Git for Windows Build Agent

committed

git-gui--askyesno (mingw): use Git for Windows' icon, if available

authored and

Git for Windows Build Agent

committed

ci(macos): skip the `git p4` tests

authored and

Git for Windows Build Agent

committed

Merge branch 'ready-for-upstream'

authored and

Git for Windows Build Agent

committed

checkout.c: enable fscache for checkout again

Takuto Ikuta

authored and

Git for Windows Build Agent

committed

Merge branch 'git-gui-askyesno'

authored and

Git for Windows Build Agent

committed

ci(macos): skip the `git p4` tests (#5954)

authored and

Git for Windows Build Agent

committed

mingw: explicitly specify with which cmd to prefix the cmdline

authored and

Git for Windows Build Agent

committed

mingw: when path_lookup() failed, try BusyBox

authored and

Git for Windows Build Agent

committed

Enable the filesystem cache (fscache) in refresh_index().

authored and

Git for Windows Build Agent

committed

test-tool: learn to act as a drop-in replacement for `iconv`

authored and

Git for Windows Build Agent

committed

mem_pool: add GIT_TRACE_MEMPOOL support

authored and

Git for Windows Build Agent

committed

fscache: use FindFirstFileExW to avoid retrieving the short name

authored and

Git for Windows Build Agent

committed

tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`

authored and

Git for Windows Build Agent

committed

fscache: fscache takes an initial size

authored and

Git for Windows Build Agent

committed

fscache: add GIT_TEST_FSCACHE support

authored and

Git for Windows Build Agent

committed

gitattributes: mark .png files as binary

authored and

Git for Windows Build Agent

committed

fscache: update fscache to be thread specific instead of global

authored and

Git for Windows Build Agent

committed

fscache: add fscache hit statistics

authored and

Git for Windows Build Agent

committed

tests: move test PNGs into t/lib-diff/

authored and

Git for Windows Build Agent

committed

fscache: teach fscache to use mempool

authored and

Git for Windows Build Agent

committed

unpack-trees: enable fscache for sparse-checkout

authored and

Git for Windows Build Agent

committed

tests: only override sort & find if there are usable ones in /usr/bin/

authored and

Git for Windows Build Agent

committed

fscache: remember the reparse tag for each entry

authored and

Git for Windows Build Agent

committed

fscache: make fscache_enable() thread safe

authored and

Git for Windows Build Agent

committed

status: disable and free fscache at the end of the status command

authored and

Git for Windows Build Agent

committed

Merge branch 'fscache'

authored and

Git for Windows Build Agent

committed

tests: use the correct path separator with BusyBox

authored and

Git for Windows Build Agent

committed

fscache: implement an FSCache-aware is_mount_point()

authored and

Git for Windows Build Agent

committed

fscache: teach fscache to use NtQueryDirectoryFile

authored and

Git for Windows Build Agent

committed

Merge pull request #1909 from benpeart/free-fscache-after-status-gfw

authored and

Git for Windows Build Agent

committed

mingw: only use Bash-ism `builtin pwd -W` when available

authored and

Git for Windows Build Agent

committed

clean: make use of FSCache

authored and

Git for Windows Build Agent

committed

Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'

authored and

Git for Windows Build Agent

committed

tests (mingw): remove Bash-specific pwd option

authored and

Git for Windows Build Agent

committed

Merge branch 'dont-clean-junctions-fscache'

authored and

Git for Windows Build Agent

committed

test-lib: add BUSYBOX prerequisite

authored and

Git for Windows Build Agent

committed

pack-objects (mingw): demonstrate a segmentation fault with large deltas

vangdfang

authored and

Git for Windows Build Agent

committed

t5003: use binary file from t/lib-diff/

authored and

Git for Windows Build Agent

committed

mingw: support long paths

authored and

Git for Windows Build Agent

committed

mingw: introduce code to detect whether we're inside a Windows container

zcube

authored and

Git for Windows Build Agent

committed

Win32: symlink: move phantom symlink creation to a separate function

piscisaureus

authored and

Git for Windows Build Agent

committed

t5532: workaround for BusyBox on Windows

authored and

Git for Windows Build Agent

committed

win32(long path support): leave drive-less absolute paths intact

authored and

Git for Windows Build Agent

committed

mingw: when running in a Windows container, try to rename() harder

zcube

authored and

Git for Windows Build Agent

committed

Introduce helper to create symlinks that knows about index_state

authored and

Git for Windows Build Agent

committed

t5605: special-case hardlink test for BusyBox-w32

authored and

Git for Windows Build Agent

committed

mingw: Support `git_terminal_prompt` with more terminals

authored and

Git for Windows Build Agent

committed

compat/fsmonitor/fsm-*-win32: support long paths

authored and

Git for Windows Build Agent

committed

mingw: move the file_attr_to_st_mode() function definition

zcube

authored and

Git for Windows Build Agent

committed

mingw: allow to specify the symlink type in .gitattributes

piscisaureus

authored and

Git for Windows Build Agent

committed

t5813: allow for $PWD to be a Windows path

authored and

Git for Windows Build Agent

committed

compat/terminal.c: only use the Windows console if bash 'read -r' fails

authored and

Git for Windows Build Agent

committed

clean: suggest using `core.longPaths` if paths are too long to remove

mathstuf

authored and

Git for Windows Build Agent

committed

mingw: Windows Docker volumes are not symbolic links

authored and

Git for Windows Build Agent

committed

mingw: work around rename() failing on a read-only file

dsl101

authored and

Git for Windows Build Agent

committed

Win32: symlink: add test for `symlink` attribute

piscisaureus

authored and

Git for Windows Build Agent

committed

t9200: skip tests when $PWD contains a colon

authored and

Git for Windows Build Agent

committed

mingw: optionally enable wsl compability file mode bits

swigger

authored and

Git for Windows Build Agent

committed

mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

authored and

Git for Windows Build Agent

committed

Merge branch 'gitk-and-git-gui-patches'

authored and

Git for Windows Build Agent

committed

Merge branch 'long-paths'

authored and

Git for Windows Build Agent

committed

Merge branch 'msys2'

authored and

Git for Windows Build Agent

committed

Merge 'docker-volumes-are-no-symlinks'

authored and

Git for Windows Build Agent

committed

mingw: try resetting the read-only bit if rename fails (#4527)

authored and

Git for Windows Build Agent

committed

Merge pull request #1897 from piscisaureus/symlink-attr

authored and

Git for Windows Build Agent

committed

Describe Git for Windows' architecture [no ci]

authored and

Git for Windows Build Agent

committed

mingw: kill child processes in a gentler way

authored and

Git for Windows Build Agent

committed

Merge branch 'busybox-w32'

authored and

Git for Windows Build Agent

committed

Modify the Code of Conduct for Git for Windows

authored and

Git for Windows Build Agent

committed

mingw: really handle SIGINT

authored and

Git for Windows Build Agent

committed

Merge branch 'wsl-file-mode-bits'

authored and

Git for Windows Build Agent

committed

CONTRIBUTING.md: add guide for first-time contributors

authored and

Git for Windows Build Agent

committed

Partially un-revert "editor: save and reset terminal after calling EDITOR"

authored and

Git for Windows Build Agent

committed

Merge pull request #1170 from dscho/mingw-kill-process

authored and

Git for Windows Build Agent

committed

README.md: Add a Windows-specific preamble

authored and

Git for Windows Build Agent

committed

reset: reinstate support for the deprecated --stdin option

authored and

Git for Windows Build Agent

committed

Merge branch 'un-revert-editor-save-and-reset'

authored and

Git for Windows Build Agent

committed

Add an issue template

shiftkey

authored and

Git for Windows Build Agent

committed

Add a GitHub workflow to monitor component updates

authored and

Git for Windows Build Agent

committed

fsmonitor: reintroduce core.useBuiltinFSMonitor

vdye

authored and

Git for Windows Build Agent

committed

Merge branch 'phase-out-reset-stdin'

authored and

Git for Windows Build Agent

committed

Modify the GitHub Pull Request template (to reflect Git for Windows)

Philip Oakley

authored and

Git for Windows Build Agent

committed

dependabot: help keeping GitHub Actions versions up to date

authored and

Git for Windows Build Agent

committed

Merge branch 'deprecate-core.useBuiltinFSMonitor'

authored and

Git for Windows Build Agent

committed

SECURITY.md: document Git for Windows' policies

authored and

Git for Windows Build Agent

committed

Merge pull request #2837 from dscho/monitor-component-updates

authored and

Git for Windows Build Agent

committed

Merge 'readme' into HEAD