Commit Briefs

Stefan Sperling

remove lock files, as intended, when reintegrate gets aborted

diff | patch | tree

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

show file mode differences when diffing trees

diff | patch | tree

Stefan Sperling

handle xbit-only changes during 'got update'

diff | patch | tree

Stefan Sperling

teach 'got commit' to tweak the executable bit of a file

diff | patch | tree

Stefan Sperling

add 'got integrate' command

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Hiltjo Posthuma

getline: fix the return type to ssize_t and small nits

diff | patch | tree

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

Stefan Sperling

missing error check in write_tree(); found by jj@ with scan-build

diff | patch | tree

Stefan Sperling

missing errer check in update_blob(); found by jj@ with scan-build

diff | patch | tree

Hiltjo Posthuma

check calloc() for NULL return value

diff | patch | tree

Stefan Sperling

use author name/email from ~/.gitconfig if GOT_AUTHOR is not set

diff | patch | tree

Stefan Sperling

fix indentation in lib/worktree.c

diff | patch | tree

Stefan Sperling

make 'got status' ignore inaccessible directories (reported by semarie)

diff | patch | tree