Commits
- Commit:
ea66598afcb6fd0bfa2c6cad9532450223c85054
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
tog: jump directly to first log item instead of traversing the list
ok tracey
- Commit:
e4526bf56efa8d234d206abac903deccceed4f17
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
tog: add support for navigating to first/last line of tree and ref views
ok stsp
- Commit:
376d7c6217310146ba605e4994521c6fde62fc18
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
49213cad8cad44e38cd6a8da2595657b3dc11077
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
changes for 0.57
- Commit:
eca70f98448556db333b7c61d37122488b572422
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got send' adding too many objects to the pack file in some cases
Load server-side tags before loading local commits. Otherwise objects
which are reachable via server-side tags will not be filtered out.
- Commit:
0baddd91502bcd7aca9f72f5ded3609326c953cf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add test which covers a cherrypick merge from a branch to itself
- Commit:
ed99f061b0cece8bf32baf31bd5e6b9e39509127
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test case which covers 'got cherrypick' in a mixed-commit work tree
- Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
- Commit:
6435d2a6d2c84c4875a0c6f641b06d7cd1796a0c
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
sys/param.h is not needed
- Commit:
5546d4669ccce281a6f6f89ccf204e671ed0d3a9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug a memory leak in check_merge_ok()
- Commit:
a16d97bdc65b49050d622450d50642fa98eb3cc1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove ancestry sanity checks from 'got cherrypick' and 'got backout'
While these checks might catch usage mistakes the performance overhead
of scanning the entire history of the current branch is not worth it.
Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's
src repository in usr.bin/rsync:
Before: 5m50.33s real 4m02.36s user 2m04.41s system
After: 1m04.92s real 0m28.24s user 0m36.54s system
Further performance improvements could be needed but this is a first step.
- Commit:
243a13f59c19fd9761211d200b68b77f99f6aded
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bogus error when 'got cherrypick' merges changes into a locally added file
reported by + ok naddy
- Commit:
4deef56fe9fdbfef7d2ecd12947ff515a0daae78
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
tog: add support for navigating to first/last line of blame view
ok tracey stsp
- Commit:
6c13b00592a6253b4a4de885b1f595e141b65281
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Update comment regarding the merged_paths list used by rebase and histedit
with insight I obtained while trying to make this idea work, and failing...
- Commit:
dae2a678dfc5685c0f121fd205f62439f417dcc5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all