Commit Briefs

a0ea4fc07b 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

272a1371f1 Stefan Sperling

don't leak logmsg in show_rebase_progress()

diff | patch | tree

c10890ce3c Stefan Sperling

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

diff | patch | tree

5dd154fcf3 Stefan Sperling

bump version number

diff | patch | tree

233f3602d6 Stefan Sperling

changes for 0.28 (tags/0.28)

diff | patch | tree

2b6826ba41 Stefan Sperling

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

diff | patch | tree

7ef62c4e3e Stefan Sperling

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

diff | patch | tree

65db4ffb3a Stefan Sperling

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

diff | patch | tree

ddbfac99a5 Stefan Sperling

document histedit's -F option

diff | patch | tree

46fa4c83cb Stefan Sperling

explain more clearly how a histedit script will be edited

diff | patch | tree

6e54d307ad Stefan Sperling

document more clearly what needs to be done to start a histedit operation

diff | patch | tree

80106605fe Stefan Sperling

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

diff | patch | tree

da76fce2df Stefan Sperling

let 'got branch' switch and update the work tree

ok tracey

diff | patch | tree

2bdefe565f Tracey Emery

edit man page wording for histedit -m feature

diff | patch | tree

212b39d173 Christian Weisgerber

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

diff | patch | tree

083957f407 Stefan Sperling

add 'got histedit -m' option which makes it easy to edit log messages only

ok tracey

diff | patch | tree

5b66608142 Stefan Sperling

show how to log subdirectories in got.1 EXAMPLES

ok naddy

diff | patch | tree

09b5bff804 Christian Weisgerber

switch "tog diff" repository path argument to a new -r option

diff | patch | tree

a273ac941f Christian Weisgerber

fix "tog diff object1 object2" by actually extracting the repository path

from the work tree

diff | patch | tree

dc990cbf2d Stefan Sperling

document semantics of got log and tog log path arguments

diff | patch | tree

ea025d1dbc Christian Weisgerber

add ^B/^F key bindings for page up/down in the "blame" and "tree" views

diff | patch | tree

f70ffbb532 Stefan Sperling

disable compiler warnings in release builds because -Werror is bad for ports

sthen@ suggested to drop -Werror; I think we don't need any -W in release mode

diff | patch | tree

54b1c5b5cb Stefan Sperling

don't proceed if a bad imsg is received in recv_gitconfig_remotes()

diff | patch | tree

d669b9c901 Stefan Sperling

fix uninitialized variablen recv_gitconfig_remotes; found by sthen@ with gcc8

diff | patch | tree

32dfb4a213 Stefan Sperling

bump version number

diff | patch | tree