Commits
- Commit:
8cb8da5b6d133f8130a9e4e828ca00ff0bb482ca
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
document "mg" as alias for the "merge" command
- Commit:
c1e86b1d5bb299f6bcc93a8024575a12da339286
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add an xfail test for a bug in merging content with a dot on a line by itself
- Commit:
09209b8a13411e9d8464267c5e65c2c848455496
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add test for merge result when lines are inserted at the top of a file
Based on a patch by Omar Polo
- Commit:
aaef19b43a34ed335737d733fbfea51056f2e2bb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sync files from diff.git 346d4986568ffbcfdc53cce45dd8a468535a68f2
- Commit:
e7ffb0b07b18c20ebb619f3879602d629d0fbbc6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- Commit:
f736d93a2da5b433c03766eee9f631af9dec2318
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
link to the FastCDC paper from deltify.c; suggested by Ori some time ago
- Commit:
6eab69f730c8340837a82452cf8797251b3e69c2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make the number of elements in deltify's geartab explicit
- Commit:
b06f0b745c7a465de60c10ae2f0fffa84d56a221
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Ignore tags files
OK stsp
- Commit:
fbceed276169dca1e44e32d08e41f412e72190a5
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Provide lib/Makefile to enable tags file generation
The root Makefile does not hook into lib/ via <bsd.subdir.mk> since it
is not a program itself and thus gets included by all others.
This means `make tags` skips lib/ and `make -C lib/ tags` does not know
what to do; provide a minimal <bsd.lib.mk> stub and hook it up just
for the "tags" such that *all* source is browsable via tags.
See /usr/share/mk/bsd.README for details.
Feedback stsp tb
OK tb
- Commit:
e99d9267c8cc287a60f768d4282c01b9f5f6c975
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug memory leaks in got-fetch-pack and got-send-pack
ok naddy
- Commit:
dd088d9503d8e7cebbb30c535d8e4d11556c8d30
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
let 'got fetch' send all references to the server to avoid redundant downloads
Problem reported by naddy.
ok naddy
- Commit:
0c079dbc7e6ed9857d4a13d908cc6858d57c81ec
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Fix "mandoc -T lint -W style" nits
- Commit:
b13a4ebcea7c7ed18b52d65e78ea2b78cc8bcd40
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Document command aliases in tmux(1) style, add tags for navigation
Complete 95f394e8917def2c11ce292b3a8f804d261b1d12;
reminder to look at gotadmin(1) from stsp, thanks.
- Commit:
41f061b2f459318f3738f59d7676efccc4beb344
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
90e6e6204014e47bc38fb5bcaf041cfdad190718
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Fix "mandoc -T lint -W style got/got.1" nits
- Commit:
95f394e8917def2c11ce292b3a8f804d261b1d12
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Document command aliases in tmux(1) style, add tags for navigation
This has the advantage of tags being located right by the full command;
combined with tags ":tco" to search for the `co` alias will jump right
to the `checkout` line, neatly showing everything without needing
further navigation.
tmux hint from Thomas Adam, thanks.
OK stsp
- Commit:
136be4cc66ac0ccf41b481e5a22587681c050365
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update 'got merge' TODO item
- Commit:
2b8ed9ecaabe37e1f017b20d8b977e9bb1745712
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
9d9e459fa66f53a5ef36bacae7f394daacf2c6c8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.61
- Commit:
c52bf7fe573b3f64277c940f6cb99a39a07e8683
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sync dist file list
- Commit:
62da3196627c41ea9acc5f53e0da9887dca2b82d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
skip ignored directories during 'got status' disk crawl
- Commit:
b93c7142c142ac5699accd8dd259187a22e200fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
78caff98cb8783be4d83da7279e407d4ccd1f187
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
explicitly set the default branch name after 'git init' in regress tests
We need to do this because newer versions of Git support an arbitrary default
branch name which can be set by users. We don't want tests to fail when this
option is used.
pointed out by Thomas Adam
- Commit:
5d8cbca3b331d9f20dc4ee509342988c82e11656
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
pull in a type fix from the OpenBSD parse.y template
Original commit message by deraadt:
(unsigned) means (unsigned int) which on ptrdiff_t or size_t or other
larger types really is a range reduction...
Almost any cast to (unsigned) is a bug.
- Commit:
d683c314c5dae715e5918b3952e8c5870db83648
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix unsigned/signed char mismatch in parse.y