Commits

Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp
diff | patch | tree
Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
b66cd6f325e3fa7ddd17ff6dd41cf6e59d04ebf5
From:
Stefan Sperling <stsp@stsp.name>
Date:
display more context info in "no such entry found in tree" error messages
diff | patch | tree
Commit:
283102fc7ecc50b874240654162793c0bd07a028
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove the symlink conflict header feature; it causes noise for little benefit
diff | patch | tree
Commit:
3b9f0f87ff620ce7d6ad75195b0c67425bc96ab7
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle additional symlink conflicts and report skipping of unversioned files
diff | patch | tree
Commit:
993e2a1b1ac61a9d56877df5325d519f7b737375
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle symlink deletion and symlink conflicts during 'got update'
diff | patch | tree
Commit:
f35fa46a4c69eaeda5e106115e08b3cf8a0d3413
From:
Stefan Sperling <stsp@stsp.name>
Date:
add symlink support to 'got update'
diff | patch | tree
Commit:
e7303626967ed721dd323a8a6ea6c638aed46c50
From:
Stefan Sperling <stsp@stsp.name>
Date:
add submodule tests ok semarie
diff | patch | tree
Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
From:
Stefan Sperling <stsp@stsp.name>
Date:
show a summary of conflicts and related problems after updating/merging files ok millert@
diff | patch | tree
Commit:
5036ab18bf99be5d6811f17565b2c2fad47b3f73
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' skip conflicted files ok millert@
diff | patch | tree
Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
From:
Stefan Sperling <stsp@stsp.name>
Date:
show base commit hash and omit filenames in conflict markers
diff | patch | tree
Commit:
523b8417c1fee8faa1a1732ffb036e97ae2ebb4a
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle xbit-only changes during 'got update'
diff | patch | tree
Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
From:
Stefan Sperling <stsp@stsp.name>
Date:
show original file content in conflict markers
diff | patch | tree
Commit:
2a06fe5f59f1b7b42f63bd9afe5187935c341321
From:
Stefan Sperling <stsp@stsp.name>
Date:
indicate non-existent paths in 'got status' and make 'got diff' error for them
diff | patch | tree
Commit:
303e2782e0a61a1cf76da52a945ab8645a8a78ca
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for tags to -c options of some got commands
diff | patch | tree