Commits

Commit:
cff5d32f5a46800c1429011dad94c5b20b28501c
From:
Stefan Sperling <stsp@stsp.name>
Date:
change for 0.29
diff | patch | tree
Commit:
15341bfd54bbabbe30297c358faf41ee05e247da
From:
Tracey Emery <tracey@traceyemery.net>
Date:
trim directories in got remove -R This is a racy solution that needs to be properly implemented in the future. ok stsp
diff | patch | tree
Commit:
5b87815ed2f346f81374261ce2d633feae711886
From:
Stefan Sperling <stsp@stsp.name>
Date:
prevent commits from being listed more than once in a histedit script While merging a commit multiple times during a histedit operation could potentially make sense in some corner case, a commit appearing more than once in the script is more likely to happen accidentally. If desired, the same effect can still be achieved by running multiple histedit operations, or by using 'got cherrypick' while the histedit operation is paused for arbitrary editing.
diff | patch | tree
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.
diff | patch | tree
Commit:
4cb8f8f3e6cc4a795c92823235070dd921c2b42e
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix wrong use of words in a histedit error message
diff | patch | tree
Commit:
37486c756a36ae590b41cae752b0c129f5fb7ff7
From:
Stefan Sperling <stsp@stsp.name>
Date:
make our README file point at our website
diff | patch | tree
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
diff | patch | tree
Commit:
ee85c5e898e10f72841c918d9f453a6526ef7e2e
From:
Stefan Sperling <stsp@stsp.name>
Date:
map 'tog path' to 'tog log path' if possible; requested by mpi@
diff | patch | tree
Commit:
b8b3f2090ed097020d494dbf50d92a34c669707d
From:
Stefan Sperling <stsp@stsp.name>
Date:
make got_path_is_root_dir() deal with an arbitrary amount of leading slashes
diff | patch | tree
Commit:
61a7d79fef51b4bf48411fcd4542401f10acc626
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove GOT_ERR_NOT_ABSPATH and fix existing users to deal with absolute paths
diff | patch | tree
Commit:
63f810e6fee43e699585195a24eebdb53a99a4f4
From:
Stefan Sperling <stsp@stsp.name>
Date:
when "bad path" errors occur, always show the path in question
diff | patch | tree
Commit:
a2f4a3591f215ab55f58ef4ee630b960af87a4d5
From:
Stefan Sperling <stsp@stsp.name>
Date:
properly free cmd_argv in tog's main() function
diff | patch | tree
Commit:
dfd6c25013ffa89ef7879d8f6a2548f989c4f3ea
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix typo in comment; found by mpi@
diff | patch | tree
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
diff | patch | tree
Commit:
272a1371f13b6ed4076eb8f9ff4a910cd0a47ed7
From:
Stefan Sperling <stsp@stsp.name>
Date:
don't leak logmsg in show_rebase_progress()
diff | patch | tree
Commit:
c10890ce3c1950af61bcb45f7552f1d9ec14d08b
From:
Stefan Sperling <stsp@stsp.name>
Date:
in got.1, clarify that rebasing of branches with zero local changes is normal
diff | patch | tree
Commit:
5dd154fcf3014e47ec23d51776f448cb241ec873
From:
Stefan Sperling <stsp@stsp.name>
Date:
bump version number
diff | patch | tree
Commit:
233f3602d650da494c59816d4f9244f1bcc3215c
From:
Stefan Sperling <stsp@stsp.name>
Date:
changes for 0.28
diff | patch | tree
Commit:
2b6826ba4126532b017434e71e02ad55f62c1a12
From:
Stefan Sperling <stsp@stsp.name>
Date:
attempt to more clearly explain what 'got rebase' is used for
diff | patch | tree
Commit:
7ef62c4e3e891c47d0449ca61fcb3fa35a98ec51
From:
Stefan Sperling <stsp@stsp.name>
Date:
disallow 'got rebase' while a histedit operation is in progress
diff | patch | tree
Commit:
65db4ffb3adb537c4258731721f250ee99b9d13c
From:
Stefan Sperling <stsp@stsp.name>
Date:
document that 'got integrate' cannot be used during a histedit operation
diff | patch | tree
Commit:
ddbfac99a53fa279ca4ddb1557f2b93d255879a8
From:
Stefan Sperling <stsp@stsp.name>
Date:
document histedit's -F option
diff | patch | tree
Commit:
46fa4c83cb387dd597865ed526e7df7cde1fb526
From:
Stefan Sperling <stsp@stsp.name>
Date:
explain more clearly how a histedit script will be edited
diff | patch | tree
Commit:
6e54d307ad19628df87baec4835b0c8c4f9955c5
From:
Stefan Sperling <stsp@stsp.name>
Date:
document more clearly what needs to be done to start a histedit operation
diff | patch | tree
Commit:
80106605fef38d5bd94de493c3aa9ccdbcb9c8f8
From:
Stefan Sperling <stsp@stsp.name>
Date:
switch 'got tag' commit argument to a -c option for consistency
diff | patch | tree