Commit Briefs

18b9ebab6e Stefan Sperling

eflag in diff3.c is hard-coded to 3; remove code for other cases

diff | patch | tree

e9dabdfbdb Stefan Sperling

check for errors from fseek(3) in diff3.c's edscript()

diff | patch | tree

ce09ab8d7c Stefan Sperling

check for errors from diff_output() in diff3.c

diff | patch | tree

02b87977bd Stefan Sperling

convert remaining functions in diff3.c to struct got_error

diff | patch | tree

f571bb8516 Stefan Sperling

convert error handling in diff3.c's repos() to struct got_error

diff | patch | tree

180dce26a8 Stefan Sperling

convert handling in diff3.c's merge() function to struct got_error

diff | patch | tree

1b550f7ee3 Stefan Sperling

bump version number

diff | patch | tree

1b450cf1f6 Stefan Sperling

changes for 0.17 (tags/0.17)

diff | patch | tree

ba6e0c2d73 Stefan Sperling

Fix misleading wording in got.1 about branch options; -r option always works.

diff | patch | tree

ad89fa3118 Stefan Sperling

make 'got branch' without args show work tree's branch; requested by benno@

diff | patch | tree

4e99b47e58 Stefan Sperling

show temporary branch in 'got branch -l' during rebase and histedit

diff | patch | tree

50284065f7 Stefan Sperling

fix bogus error return introduced in previous commit

diff | patch | tree

e6b2373550 Stefan Sperling

update reference list when 'tog log' view is refreshed with Ctrl+L

diff | patch | tree

bd8de4305a Stefan Sperling

make 'got status' read .gitignore files; support **/ and /**/ in patterns

diff | patch | tree

db1d3576eb Stefan Sperling

handle empty trees during 'import' and 'checkout'; spotted by sthen@

diff | patch | tree

13555e04f0 Sebastien Marie

Show only whitelisted commit headers in 'got log'

Generic way to deal with gpgsig header or extra headers added by some tools. All headers still available via 'got cat' ok stsp@

diff | patch | tree

500467ff1b Hiltjo Posthuma

getline: fix the return type to ssize_t and small nits

diff | patch | tree

3ba86cef03 Stefan Sperling

direct patch reviews and other discussion away from my private inbox

diff | patch | tree

b077bccd43 Stefan Sperling

remove pointless oflag from struct diff3_state

diff | patch | tree

4a669b4d30 Stefan Sperling

bump version number

diff | patch | tree

eab2e76a21 Stefan Sperling

CHANGES for 0.16 (tags/0.16)

diff | patch | tree

6dea73dfe7 Stefan Sperling

Replace fgetln() with getline()

getline() is, per the latter's OpenBSD man page, safer and more portable than fgetln().

diff | patch | tree

303e14b5e9 Stefan Sperling

Add missing includes for time() and ctime()

These headers were implicitly used on OpenBSD, but building on Linux revealed that <time.h> wasn't included directly. diffreg.c uses ctime(), which additionally needs <sys/types.h>.

diff | patch | tree

83290b45b0 Stefan Sperling

Remove return value from diffreg's fetch()

The last use of this was removed in 0165cdf03ffac4c24334979832ad27554913d54c over a year ago.

diff | patch | tree

8fbe07c208 Stefan Sperling

Remove unused variable in diffreg's fetch()

diff | patch | tree