Commits


fix recent regression in tog where split view was not restored after resize ok jamesk


make it possible to show just one tag with 'got tag -l' suggested by jrick ok jrick jamsek


move got_opentempfd() out of lib/diff.c again ok tracey


move got_opentempfd out of blame_open ok stsp@ jrick@


pass the correct file to fdopen(); ok tracey


fix missed dup in open_blob per stsp@


move got_opentempfd out of open_blob. ok stsp@


implement support for commit coloring in got-read-pack for speed ok op, tracey


tog: echo count prefix when entering compound key maps like less(1), echo the digits as they're typed. suggested by and ok op@ stsp@


got patch: handle git-style diffs for the 3-way merge too tweak and ok stsp@


handle blob ids without corresponding blob ids ok stsp@


build with -Wwrite-strings Throwing this into the mix for a while, we can always get rid of it again if it becomes annoying. No objections from stsp@


allow start_pack_privsep_child() to be called from outside lib/object.c


always show commit or tree IDs in diff header, in order to help 'got patch' The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@


build with -Wmissing-prototypes ok stsp@