Commits
- 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
- Commit:
fa161f0bf4d34a678ba30bf62f5e8eec44ceb931
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update a CAVEAT in got.1 now that 'got merge' exists
- Commit:
cd33da4893c91d59c1e0a4f296e07c08cfd82bcb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
1fa4907213af37d50029ee33b989867f41f0f124
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
606719cd7bdc625a582f93ddbc966675568f0026
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document all reasons why 'got merge' might be interrupted
- Commit:
c1b057235b48f7b8bc01bd3c31348517856bc68b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
- Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
print additional stats about things that went wrong during a merge