Commits

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
Commit:
da76fce2dfde1786444285db2a03ddf14328c662
From:
Stefan Sperling <stsp@stsp.name>
Date:
let 'got branch' switch and update the work tree ok tracey
diff | patch | tree
Commit:
2bdefe565f8d42c1fa6a794670e18f1d2d643c53
From:
Tracey Emery <tracey@traceyemery.net>
Date:
edit man page wording for histedit -m feature
diff | patch | tree
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
diff | patch | tree
Commit:
083957f4072e9d36c5c770055348c03850e63b30
From:
Stefan Sperling <stsp@stsp.name>
Date:
add 'got histedit -m' option which makes it easy to edit log messages only ok tracey
diff | patch | tree
Commit:
5b66608142185bf4240db42d8819f75303538281
From:
Stefan Sperling <stsp@stsp.name>
Date:
show how to log subdirectories in got.1 EXAMPLES ok naddy
diff | patch | tree
Commit:
09b5bff804353d5930f67d05e453815493aeb225
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
switch "tog diff" repository path argument to a new -r option
diff | patch | tree
Commit:
a273ac941fef190ba5179b88c6809eebe471b8b3
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
fix "tog diff object1 object2" by actually extracting the repository path from the work tree
diff | patch | tree
Commit:
dc990cbf2d39c406ff23bc36e6cbb822f747ee42
From:
Stefan Sperling <stsp@stsp.name>
Date:
document semantics of got log and tog log path arguments
diff | patch | tree
Commit:
ea025d1dbc11c33fec290591f35673b896edd822
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
add ^B/^F key bindings for page up/down in the "blame" and "tree" views
diff | patch | tree
Commit:
f70ffbb53218e6d26d9ef6babd8c106b105db18b
From:
Stefan Sperling <stsp@stsp.name>
Date:
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