Commits
- Commit:
de05890fef951240ac68a3ea9a577a6f82be6194
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix histedit 'rebase commit ID mismatch' error when splitting a commit
Commit IDs on histedit's temporary branch can change arbitrarily because
the user may create new commits on this branch while editing past commits.
So there is no point in trying to verify these IDs like we do during rebase.
Add a test case which demonstrates the problem.
- Commit:
4cb8f8f3e6cc4a795c92823235070dd921c2b42e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix wrong use of words in a histedit error message
- Commit:
37486c756a36ae590b41cae752b0c129f5fb7ff7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make our README file point at our website
- Commit:
4b6c9460c99283f193f32bd5177bb09047abacf3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
be helpful when users try to check out work trees without a known branch
Provide a useful error message in such cases and explicitly document
intentional restrictions in the got(1) man page.
Prompted by a question from Adam Steen via bsd.network
https://bsd.network/@adams/103768951483318235
- Commit:
ee85c5e898e10f72841c918d9f453a6526ef7e2e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
map 'tog path' to 'tog log path' if possible; requested by mpi@
- Commit:
b8b3f2090ed097020d494dbf50d92a34c669707d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got_path_is_root_dir() deal with an arbitrary amount of leading slashes
- Commit:
61a7d79fef51b4bf48411fcd4542401f10acc626
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove GOT_ERR_NOT_ABSPATH and fix existing users to deal with absolute paths
- Commit:
63f810e6fee43e699585195a24eebdb53a99a4f4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
when "bad path" errors occur, always show the path in question
- Commit:
a2f4a3591f215ab55f58ef4ee630b960af87a4d5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
properly free cmd_argv in tog's main() function
- Commit:
dfd6c25013ffa89ef7879d8f6a2548f989c4f3ea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix typo in comment; found by mpi@
- Commit:
a0ea4fc07b81c69fa0409a2e39e702659f256179
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show merged commit ID + logmsg upon merge conflict during rebase and histedit
This makes it more apparent which commit contained the conflicting change.
The new output looks like this:
C sys/dev/pci/if_iwm.c
8a98d848a1a5 -> merge conflict: properly modify station queues
got: conflicts must be resolved before rebasing can continue
- Commit:
272a1371f13b6ed4076eb8f9ff4a910cd0a47ed7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don't leak logmsg in show_rebase_progress()
- Commit:
c10890ce3c1950af61bcb45f7552f1d9ec14d08b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in got.1, clarify that rebasing of branches with zero local changes is normal
- Commit:
5dd154fcf3014e47ec23d51776f448cb241ec873
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
233f3602d650da494c59816d4f9244f1bcc3215c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
changes for 0.28
- Commit:
2b6826ba4126532b017434e71e02ad55f62c1a12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
attempt to more clearly explain what 'got rebase' is used for
- Commit:
7ef62c4e3e891c47d0449ca61fcb3fa35a98ec51
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
disallow 'got rebase' while a histedit operation is in progress
- Commit:
65db4ffb3adb537c4258731721f250ee99b9d13c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document that 'got integrate' cannot be used during a histedit operation
- Commit:
ddbfac99a53fa279ca4ddb1557f2b93d255879a8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document histedit's -F option
- Commit:
46fa4c83cb387dd597865ed526e7df7cde1fb526
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
explain more clearly how a histedit script will be edited
- Commit:
6e54d307ad19628df87baec4835b0c8c4f9955c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document more clearly what needs to be done to start a histedit operation
- Commit:
80106605fef38d5bd94de493c3aa9ccdbcb9c8f8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch 'got tag' commit argument to a -c option for consistency
- Commit:
da76fce2dfde1786444285db2a03ddf14328c662
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
let 'got branch' switch and update the work tree
ok tracey
- Commit:
2bdefe565f8d42c1fa6a794670e18f1d2d643c53
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
edit man page wording for histedit -m feature
- Commit:
212b39d173639f6f9aab137db52b888d5e1022ec
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
Sync the description of the -r flag from "tree" to the other commands.
Clarify that if the current directory is a work tree, tog will pick
the repository associated with this work tree by default.
ok stsp