Commits

Commit:
5788893e052e36c9c54c8ab6781ed97a5fca6f91
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix off-by-one error in delta length; from ori git9 commit fbb2fb7c87d8edf58e22c84f575853dc9de79ac4
diff | patch | tree
Commit:
f364801d387c39c215e631fb221d30fbcd931ab8
From:
Stefan Sperling <stsp@stsp.name>
Date:
first pass over deltify.c: adapt coding style and data types; make it compile
diff | patch | tree
Commit:
2a0e67f7afc1daea58c6ee6104f8b11880b5999e
From:
Stefan Sperling <stsp@stsp.name>
Date:
Ori has authorized a licence change to OpenBSD's license template
diff | patch | tree
Commit:
56e7a15f6ffdae9e6b9c6929aeecfa71db9b1a73
From:
Stefan Sperling <stsp@stsp.name>
Date:
add deltify.c, unmodified from git9, with license header added
diff | patch | tree
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.
diff | patch | tree
Commit:
9f8221f0becb1dbf90fe65c44b02f9a247f7b957
From:
Stefan Sperling <stsp@stsp.name>
Date:
happy new year
diff | patch | tree
Commit:
83b4cfd8d3aac13d1d1628188ecc5a60c729b014
From:
Stefan Sperling <stsp@stsp.name>
Date:
bump version number
diff | patch | tree
Commit:
2664411dece82c78fa33d0065075d1e273d0f9f7
From:
Stefan Sperling <stsp@stsp.name>
Date:
CHANGES for 0.49
diff | patch | tree
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!
diff | patch | tree
Commit:
8ea5c9979e9868aea3b985582195d97ace1f9665
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
got info: fix a pasto in an error message
diff | patch | tree
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
diff | patch | tree
Commit:
df3ed485f4148d31d1b555abb99fcba42c1a49b7
From:
Stefan Sperling <stsp@stsp.name>
Date:
simplify the error message shown when 'got rebase' has nothing to do
diff | patch | tree
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@
diff | patch | tree
Commit:
a5a46be28fbbc316a4ce0adb5d92571a59a7e115
From:
Stefan Sperling <stsp@stsp.name>
Date:
in 'got clone', allow -l together with -q, for consistency with 'got fetch'
diff | patch | tree
Commit:
7b4f1fcb86e79aa7573d68553cd5324d4f2b148f
From:
Stefan Sperling <stsp@stsp.name>
Date:
in got.1 fix a 'got branch' example which used obsolete syntax
diff | patch | tree
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
diff | patch | tree
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.
diff | patch | tree
Commit:
455f928e1e14791531139b0815e1b1b1355b76b9
From:
Stefan Sperling <stsp@stsp.name>
Date:
bump version number
diff | patch | tree
Commit:
8c6f70b8447af7b0c6a6d0feed3417168ce13ee2
From:
Stefan Sperling <stsp@stsp.name>
Date:
CHANGES for 0.48
diff | patch | tree
Commit:
60e40e9508a5c419b43c5c0d32f9a3af81546463
From:
Stefan Sperling <stsp@stsp.name>
Date:
close file handles before freeing other things in got_worktree_close() The work tree's path needs to be valid while constructing error messages.
diff | patch | tree
Commit:
e7abd6b665c4cff5b07ed20382f14cc1b5775c5c
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix missing close(2) error check in got_worktree_close()
diff | patch | tree
Commit:
08578a35f60be8657db97b705f27a55ab61850c8
From:
Stefan Sperling <stsp@stsp.name>
Date:
make close(2) failure checks consistent; check 'close() == -1' everywhere ok millert, naddy
diff | patch | tree
Commit:
56b63ca4ab1049de6fa2d6910ce22c16e2b42a53
From:
Stefan Sperling <stsp@stsp.name>
Date:
make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere ok millert, naddy
diff | patch | tree
Commit:
a6b21eef0424b9af0a7d5dc6ade675b94dde3150
From:
Stefan Sperling <stsp@stsp.name>
Date:
add missing braces around multi-line if-statement in got_worktree_close()
diff | patch | tree
Commit:
a06ff56fe6d05906b4a5c515605b1196b3479d1f
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
fix a use after free() ok jrick stsp
diff | patch | tree