Commit Briefs

Stefan Sperling

add a -q option to tests for quiet output and use it for 'make regress'

Previous default output remains when test cases are run individually. ok tracey

diff | patch | tree

Stefan Sperling

display more context info in "no such entry found in tree" error messages

diff | patch | tree

Stefan Sperling

remove the symlink conflict header feature; it causes noise for little benefit

diff | patch | tree

Stefan Sperling

handle additional symlink conflicts and report skipping of unversioned files

diff | patch | tree

Stefan Sperling

handle symlink deletion and symlink conflicts during 'got update'

diff | patch | tree

Stefan Sperling

add symlink support to 'got update'

diff | patch | tree

Stefan Sperling

add submodule tests

ok semarie

diff | patch | tree

Stefan Sperling

show a summary of conflicts and related problems after updating/merging files

ok millert@

diff | patch | tree

Stefan Sperling

make 'got update' skip conflicted files

ok millert@

diff | patch | tree

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

handle xbit-only changes during 'got update'

diff | patch | tree

Stefan Sperling

show original file content in conflict markers

diff | patch | tree

Stefan Sperling

indicate non-existent paths in 'got status' and make 'got diff' error for them

diff | patch | tree

Stefan Sperling

add support for tags to -c options of some got commands

diff | patch | tree

Stefan Sperling

fix typo in test commit log message

diff | patch | tree