Commits
- 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
- Commit:
4dfb2f0f5fc9cda1a29a92fc304c67d15e269014
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
mention bare repos in git-repository(5), not got(1)
- Commit:
a3a2b44e8b83e1f4e59def8c5cb0eb693a929493
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
more wording tweaks in git-repository(5)
- Commit:
f877d8eb0b92ef048583ba1aeca2f3691b38ca4e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix documentation of .git/branches/ directory
- Commit:
fb2921d0ffe234621eb5577cada1a99fa6b777a6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
wording tweak in got(1) man page
- Commit:
ae73e26f451fd81bf5a4f419d3494885f03a6a55
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
mark-up tweak in got(1) man page
- Commit:
5531f75d2704cd5468e3f90f48c6f84e4f4e1efa
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove mission statement from got(1) man page
- Commit:
6cd959e6da8061ac857a36c0a472845979aca829
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
typo in got(1) man page
- Commit:
079890a9ef8cbc99ed224651c9bb509d4306e006
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document the new A and D status codes for 'got status'
- Commit:
3d50f2917e1bf7e8cf9d2261341ffce1425e2b40
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
typos and wording fixes in git-repository(5)
- Commit:
03301f46d110a7f90497e9d6730c1ffae61f9620
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
various tweaks and additions to git-repository(5) man page
- Commit:
fdcf78bba23855311035c8480d0e57373fe094bc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
typo fix in got-worktree(5)