Commit Briefs

14ae1db50e Stefan Sperling

plug memory leaks in diff_fileindex_dir()

diff | patch | tree

f2cf8fbb2f Stefan Sperling

improve partial update documentation

diff | patch | tree

c4cdcb68ce Stefan Sperling

add support for partial updates, which affect specific paths only

diff | patch | tree

c02c541e86 Stefan Sperling

scan for git repository before applying unveil(2)

diff | patch | tree

70ac5f8404 Stefan Sperling

more init fixes for ref lists in tog

diff | patch | tree

a55555f2c7 Stefan Sperling

ensure that ref list is always initialized in tog's cmd_log()

diff | patch | tree

a129376b6f Stefan Sperling

add initial implementation of 'got revert'

diff | patch | tree

95edb37e3f Stefan Sperling

add missing error string for GOT_ERR_FILE_OBSTRUCTED

diff | patch | tree

66b11bf55a Stefan Sperling

add a test for wt rm vs repo rm

diff | patch | tree

fc6346c42a Stefan Sperling

don't leave file as unversioned in case of wt edit vs repo rm

diff | patch | tree

13d9040b96 Stefan Sperling

test and improve behaviour for wt edit vs repo rm conflict

diff | patch | tree

085d5bcf0b Stefan Sperling

use a better naming scheme for tree conflict tests

diff | patch | tree

708d8e672e Stefan Sperling

fix behaviour when update deletes an edited file

diff | patch | tree

e9b3576faf Stefan Sperling

document when tog(1) uses split-screen views

diff | patch | tree

9419758ad1 Stefan Sperling

markup fix in tog(1) man page

diff | patch | tree

95adcdcaec Stefan Sperling

add some diff tests

diff | patch | tree

7154f6ce06 Stefan Sperling

make 'got status' detect and indicate merge conflict markers

diff | patch | tree

01a4495616 Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

3165301c5a Stefan Sperling

test conflict resolution in test_update_conflict_add_vs_add

diff | patch | tree

1430b4e093 Stefan Sperling

treat 'add vs add' on update as a text conflict for now

diff | patch | tree

a7c182ac81 Stefan Sperling

missing error return in test_double_add

diff | patch | tree

71a293558d Stefan Sperling

fix behaviour when 'got rm' is used twice

diff | patch | tree

5c99ca9fe4 Stefan Sperling

fix behaviour when 'got add' is used twice

diff | patch | tree

4dfb2f0f5f Stefan Sperling

mention bare repos in git-repository(5), not got(1)

diff | patch | tree

a3a2b44e8b Stefan Sperling

more wording tweaks in git-repository(5)

diff | patch | tree