Commits
- Commit:
e600f1246e15fff13251ba9d299d74a24ae579c2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ensure that old commits remain referenced after rebase and histedit
Create automatic "backup" references which ensure that objects from
the pre-rebase or pre-histedit state remain in the repository.
A new -l option for 'got rebase' and 'got histedit' lists old commits.
This makes it easier to recover from botched rebase or histedit operations.
Removal of such objects currently requires got ref -d and git-gc.
This will be made more convenient in the future.
testing and ok jrick
- Commit:
601aba22ab7ec8a86055e5fca4fcef11882c3ba4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve got ref -d documentation: mention that objects won't be deleted
ok jrick
- Commit:
ec6d1a368f4f81cda70f8517eb0dec5028b847b8
- From:
- Josh Rickmar <jrick@companyzero.com>
- Date:
Fix strftime(3) short buffer checks
strftime(3) returns 0 if the buffer was too short to write the
complete string (including NUL) and will never return more than
maxsize-1.
ok stsp
- Commit:
4e20a6488836bfbb096ecad1bad212e094cc8624
- From:
- Josh Rickmar <jrick@companyzero.com>
- Date:
Clarify log -x is inclusive
ok stsp
- Commit:
59d1e4a0a9c19debc27746357d97084b59a76db8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement raw object data access; this will be required for packing
- Commit:
8704c7cea5c81c45015529a58461bf8b49f9c4d9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a simple deltify test
- Commit:
69aa0e90839745f70c6fc7e33c78bbe949f3500d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
substantial rewrite of deltify.c; operate on plain files only
- Commit:
5788893e052e36c9c54c8ab6781ed97a5fca6f91
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix off-by-one error in delta length; from ori
git9 commit fbb2fb7c87d8edf58e22c84f575853dc9de79ac4
- Commit:
f364801d387c39c215e631fb221d30fbcd931ab8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
first pass over deltify.c: adapt coding style and data types; make it compile
- Commit:
2a0e67f7afc1daea58c6ee6104f8b11880b5999e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Ori has authorized a licence change to OpenBSD's license template
- Commit:
56e7a15f6ffdae9e6b9c6929aeecfa71db9b1a73
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add deltify.c, unmodified from git9, with license header added
- Commit:
bc62ede807f0ad3a920fa1e8b05dd90cc8f5f289
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use Myers diff instead of Patience diff when merging files with diff3
Myers diff tends to divide files into smaller diff chunks, while Patience
diff attemps to maximize the size of diff chunks. Smaller diffs chunks
generally result in a more managable presentation of merge conflicts.
- Commit:
9f8221f0becb1dbf90fe65c44b02f9a247f7b957
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
happy new year
- Commit:
83b4cfd8d3aac13d1d1628188ecc5a60c729b014
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
2664411dece82c78fa33d0065075d1e273d0f9f7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.49
- Commit:
34d4e04c36ba27442a4c0c7187e648ce03e23275
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
include remote branches in the output of 'got branch -l'
This makes it easier to discover the existence of copies of remote
branches in the local repository, and fixes a missing asterisk in
'got branch -l' while the work tree is switched to a remote branch.
Prompted by feedback from helg, thanks!
- Commit:
8ea5c9979e9868aea3b985582195d97ace1f9665
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
got info: fix a pasto in an error message
- Commit:
9dbd8627b9a09ee8f2bf24e6d6a7809f18bb6dbb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tolerate tag objects which lack tagger timestamp information
Fixes interop with repos such as git://github.com/steveicarus/iverilog.git
Found by + ok naddy
- Commit:
df3ed485f4148d31d1b555abb99fcba42c1a49b7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify the error message shown when 'got rebase' has nothing to do
- Commit:
28cf319f780087bba863715f31d4ec417eb87a6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got commit -F' option to commit with a log message stored in a file
To avoid accidents commit -F opens the prepared log message in an editor
so it can be reviewed before the commit is created.
For non-interactive use the -N option is required in addition to -F.
ok millert@
- Commit:
a5a46be28fbbc316a4ce0adb5d92571a59a7e115
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in 'got clone', allow -l together with -q, for consistency with 'got fetch'
- Commit:
7b4f1fcb86e79aa7573d68553cd5324d4f2b148f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in got.1 fix a 'got branch' example which used obsolete syntax
- Commit:
c0c4acc88418ca34083144bd4feeb1c4001fc092
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tog: fix behaviour when 'n' is pressed before a search was started with '/'
reported by + ok naddy
- Commit:
6e210706a4224007cf266b48c28e5a54e8279589
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implicitly mark all files in work tree as up-to-date after 'got integrate'
Avoids having to run 'got update' for no good reason after 'got integrate'.
The same change was made recently for both rebase and histedit in
commit a615e0e7796ea1103a6e0d4b5dbb6134597886660 and we forgot about histedit.
- Commit:
455f928e1e14791531139b0815e1b1b1355b76b9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number