op public repos

Commits

Commit:: a2f4a3591f215ab55f58ef4ee630b960af87a4d5
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 28 19:37:37 2020 UTC

properly free cmd_argv in tog's main() function

diff | patch | tree

Commit:: dfd6c25013ffa89ef7879d8f6a2548f989c4f3ea
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 28 19:36:57 2020 UTC

fix typo in comment; found by mpi@

diff | patch | tree

Commit:: a0ea4fc07b81c69fa0409a2e39e702659f256179
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 28 17:37:53 2020 UTC

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:: Fri Feb 28 17:32:05 2020 UTC

don't leak logmsg in show_rebase_progress()

diff | patch | tree

Commit:: c10890ce3c1950af61bcb45f7552f1d9ec14d08b
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 25 13:32:18 2020 UTC

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:: Tue Feb 25 12:59:17 2020 UTC

bump version number

diff | patch | tree

Commit:: 233f3602d650da494c59816d4f9244f1bcc3215c
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Feb 25 12:54:34 2020 UTC

changes for 0.28

diff | patch | tree

Commit:: 2b6826ba4126532b017434e71e02ad55f62c1a12
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Feb 24 22:04:15 2020 UTC

attempt to more clearly explain what 'got rebase' is used for

diff | patch | tree

Commit:: 7ef62c4e3e891c47d0449ca61fcb3fa35a98ec51
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Feb 24 21:31:31 2020 UTC

disallow 'got rebase' while a histedit operation is in progress

diff | patch | tree

Commit:: 65db4ffb3adb537c4258731721f250ee99b9d13c
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Feb 24 21:22:56 2020 UTC

document that 'got integrate' cannot be used during a histedit operation

diff | patch | tree

Commit:: ddbfac99a53fa279ca4ddb1557f2b93d255879a8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Feb 24 21:12:49 2020 UTC

document histedit's -F option

diff | patch | tree

Commit:: 46fa4c83cb387dd597865ed526e7df7cde1fb526
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Feb 24 21:12:21 2020 UTC

explain more clearly how a histedit script will be edited

diff | patch | tree

Commit:: 6e54d307ad19628df87baec4835b0c8c4f9955c5
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Feb 24 21:03:20 2020 UTC

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:: Mon Feb 24 20:31:09 2020 UTC

switch 'got tag' commit argument to a -c option for consistency

diff | patch | tree

Commit:: da76fce2dfde1786444285db2a03ddf14328c662
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Feb 24 20:31:09 2020 UTC

let 'got branch' switch and update the work tree ok tracey

diff | patch | tree