Commits
- Commit:
b7011c591b3ddd2fc487615e4106ab29a93e1b84
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix double-free in error path of open_blob()
- Commit:
573463cc61f9bda627a7e2ea5fee789cff67b01d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
init output parameter in walk_dir()
- Commit:
14ae1db50e77b79d408122595a67280b1c0f1e13
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug memory leaks in diff_fileindex_dir()
- Commit:
f2cf8fbb2f991890d446eb5f7b566b2c8312333c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve partial update documentation
- Commit:
c4cdcb68ce13515b0852719b9690a470731c3d5d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for partial updates, which affect specific paths only
- Commit:
c02c541e86ab0a00bfa00cfe311ad98d536355c3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
scan for git repository before applying unveil(2)
- Commit:
70ac5f8404f46cd2a9d3cb6c34cb89e61c76df1f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
more init fixes for ref lists in tog
- Commit:
a55555f2c7fbcf2e430c5a8a866e53221dd8d279
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ensure that ref list is always initialized in tog's cmd_log()
- Commit:
a129376b6f8adc074c4b53a4f78195ca32b78b1a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add initial implementation of 'got revert'
- Commit:
95edb37e3f3bec85f054ff6fc44a9eca557e6080
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add missing error string for GOT_ERR_FILE_OBSTRUCTED
- Commit:
66b11bf55ace941fdc76ae52116920008e026bdb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for wt rm vs repo rm
- Commit:
fc6346c42a66d7fc562608e08dbd41e775facfc4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don't leave file as unversioned in case of wt edit vs repo rm
- Commit:
13d9040b96f5ba9ac50c137a9909f824dd5bde20
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test and improve behaviour for wt edit vs repo rm conflict
- Commit:
085d5bcf0b7635235aeaa2608540072bdc88ae99
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a better naming scheme for tree conflict tests
- Commit:
708d8e672e598275721ee0e9707e5bea2b0435b4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix behaviour when update deletes an edited file
- Commit:
e9b3576faf75d4564e5ed585837da4482e6a9c26
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document when tog(1) uses split-screen views
- Commit:
9419758ad1a4c8ffc59729ca82fb4e73a3a803df
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
markup fix in tog(1) man page
- Commit:
95adcdcaec7617831087917a2967c0cc475860bc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add some diff tests
- Commit:
7154f6ce0618e7d8582cd42d577f01cbc3c18d16
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got status' detect and indicate merge conflict markers
- Commit:
01a44956166c76e44f58809e5a1ea1477adfef80
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
declare conflict marker strings in got_lib_diff.h
- Commit:
3165301c5af64176c55b5c4c7dbfab343106e3e9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test conflict resolution in test_update_conflict_add_vs_add
- Commit:
1430b4e093e8dcc1a214e26991cd06d3992db829
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
treat 'add vs add' on update as a text conflict for now
- Commit:
a7c182ac81f43ee290d92ff16781ea0b908c33c3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
missing error return in test_double_add
- Commit:
71a293558dcac7d17b10ae63f911aaf3f5b30df2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix behaviour when 'got rm' is used twice
- Commit:
5c99ca9fe447187c440a413772fb14201f30a1d2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix behaviour when 'got add' is used twice