Commits

Commit:
46f68b205b4ab514846c5352c6d952720b9da365
From:
Stefan Sperling <stsp@stsp.name>
Date:
show file mode differences when diffing trees
diff | patch | tree
Commit:
523b8417c1fee8faa1a1732ffb036e97ae2ebb4a
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle xbit-only changes during 'got update'
diff | patch | tree
Commit:
1ebedb77e0d68bff22163a9aafc13db5f3f706df
From:
Stefan Sperling <stsp@stsp.name>
Date:
teach 'got commit' to tweak the executable bit of a file
diff | patch | tree
Commit:
7ca04879e263ade3c559033b1188538df6e62478
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix a tog log view performance bug when lots of commits are loaded
diff | patch | tree
Commit:
73529b9f61583f0e9c36cd6ce82523837e394747
From:
Stefan Sperling <stsp@stsp.name>
Date:
set the executable bit on integrate.sh
diff | patch | tree
Commit:
14c25ea21a5249517b484961e2c3b753ffb0454e
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a 'got integrate' example to the man page
diff | patch | tree
Commit:
3aef623b225b81a61fd3786dc79d091f47b68225
From:
Stefan Sperling <stsp@stsp.name>
Date:
catch and reject integration into the freshly rebased branch
diff | patch | tree
Commit:
2822a3526b8c61302ec86e0871e724c07a4b078d
From:
Stefan Sperling <stsp@stsp.name>
Date:
add 'got integrate' command
diff | patch | tree
Commit:
13add98862efe69781a0693d9af2c45d235f1f43
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix interlocking between tog log and man threads during search
diff | patch | tree
Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
From:
Stefan Sperling <stsp@stsp.name>
Date:
show original file content in conflict markers
diff | patch | tree
Commit:
c6368c2e90c223c41439b12ae7f14fffbd894dfa
From:
Stefan Sperling <stsp@stsp.name>
Date:
properly handle read errors in got_packidx_init_hdr (found by jj@ scan-build)
diff | patch | tree
Commit:
366e0a5f18070d353035fdfa945719809c60f0aa
From:
Stefan Sperling <stsp@stsp.name>
Date:
prevent a NULL deref in an error path of got.c's diff_trees()
diff | patch | tree
Commit:
d59c0cb27bc304bc11f9b1094c6eb85f248c7c5f
From:
Stefan Sperling <stsp@stsp.name>
Date:
improve use of mixed size_t/off_t types in diff3.c's edscript()
diff | patch | tree
Commit:
b2338effff1d654d54ab1abfdebefee508ea1a6c
From:
Stefan Sperling <stsp@stsp.name>
Date:
diff3.c: do not use the same variables for both line numbers and byte offsets
diff | patch | tree
Commit:
887758148e9d113851e356d0339dc4a726b04bc0
From:
Stefan Sperling <stsp@stsp.name>
Date:
diff3.c's skip() returns number of bytes skipped so switch from int to size_t
diff | patch | tree
Commit:
11594751a637af8ed9657c295779abcf0faf3a27
From:
Stefan Sperling <stsp@stsp.name>
Date:
sync distfile list
diff | patch | tree
Commit:
96cbb59708cdbe5ff619b9d9cccae495277071e5
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove worklist code; it was only used to unlink files which we already unlink
diff | patch | tree
Commit:
68bda3b1b9c8bd7159479cf0c194d755b7d2a7cd
From:
Stefan Sperling <stsp@stsp.name>
Date:
diff3.c: check for unlink errors and unlink dp13 and dp23 again
diff | patch | tree
Commit:
9688d20ad63057dfb1047a7c31d629b07d92618b
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename local variable in diff3.c's edscript() from j to len (not a loop index)
diff | patch | tree
Commit:
9d4a5e899df48f7da001cde629f33a3de43b6092
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename local variable in diff3.c's skip() from j to len (not a loop index)
diff | patch | tree
Commit:
db33008019148e836335b567f0f5be5e757f2bdb
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove pointless attempt of unlinking temporary file name template paths
diff | patch | tree
Commit:
e45311301ff386e9a2f9ff3e613d520f57ad119b
From:
Stefan Sperling <stsp@stsp.name>
Date:
do not leak open file in diff3.c's readin() error paths
diff | patch | tree
Commit:
971405a7e47997a87d869bc30b3fca98083395dc
From:
Stefan Sperling <stsp@stsp.name>
Date:
do not abuse d3s->fp[0] as a local variable in diff3.c's readin()
diff | patch | tree
Commit:
50351dee7e55367d42b3a715d56abdd7751978cd
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove unused 'pr' argument from diff3.c's skip() function
diff | patch | tree
Commit:
f16e404405cee25eaeec2bebd3555ed373bb5b73
From:
Stefan Sperling <stsp@stsp.name>
Date:
explicitly document that 'got ref' expects absolute reference names
diff | patch | tree