Commit Briefs

Stefan Sperling

map 'tog path' to 'tog log path' if possible; requested by mpi@

diff | patch | tree

Stefan Sperling

make got_path_is_root_dir() deal with an arbitrary amount of leading slashes

diff | patch | tree

Stefan Sperling

remove GOT_ERR_NOT_ABSPATH and fix existing users to deal with absolute paths

diff | patch | tree

Stefan Sperling

when "bad path" errors occur, always show the path in question

diff | patch | tree

Stefan Sperling

properly free cmd_argv in tog's main() function

diff | patch | tree

Stefan Sperling

fix typo in comment; found by mpi@

diff | patch | tree

Stefan Sperling

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

Stefan Sperling

don't leak logmsg in show_rebase_progress()

diff | patch | tree

Stefan Sperling

in got.1, clarify that rebasing of branches with zero local changes is normal

diff | patch | tree

Stefan Sperling

bump version number

diff | patch | tree

Stefan Sperling

changes for 0.28 (tags/0.28)

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

document histedit's -F option

diff | patch | tree