commit - a6a41c00c02fea04f7404346c818a2448becd8b9
commit + 6c34b1aaf4f7557da7a8f12bfc5109491faa1937
blob - 19df8926d7f0feb219d5f654a077dac2f6110760
blob + 006b16f61cb6b59d1c80295b836e7e5d31e89f9d
--- include/got_commit_graph.h
+++ include/got_commit_graph.h
@@ -21,9 +21,8 @@ const struct got_error *got_commit_graph_open(struct g
     struct got_repository *repo);
 void got_commit_graph_close(struct got_commit_graph *);
 
-const struct got_error *
-got_commit_graph_fetch_commits(struct got_commit_graph *, int,
-    struct got_repository *);
+const struct got_error *got_commit_graph_fetch_commits(
+    struct got_commit_graph *, int, struct got_repository *);
 const struct got_error *got_commit_graph_iter_start(
     struct got_commit_graph *, struct got_object_id *, struct got_repository *);
 const struct got_error *got_commit_graph_iter_next(struct got_object_id **,
blob - f80b6b9455be8bea47ca7815749d16720a267a51
blob + 79cfc0f733a6c5652963c916118617590ffa1389
--- include/got_diff.h
+++ include/got_diff.h
@@ -30,9 +30,8 @@ const struct got_error *got_diff_blob(struct got_blob_
  * well as a const char * diff header label which identifies the file.
  * The number of context lines to show in the diff must be specified as well.
  */
-const struct got_error *
-got_diff_blob_file(struct got_blob_object *, FILE *, size_t, const char *, int,
-    FILE *);
+const struct got_error *got_diff_blob_file(struct got_blob_object *, FILE *,
+    size_t, const char *, int, FILE *);
 
 /*
  * Compute the differences between two trees and write unified diff text
blob - c6f0b0364810e7c3a2c73ea7e9a422356e3cefac
blob + 2bd95039582b9f7349099a9e19cd046c5028db04
--- include/got_object.h
+++ include/got_object.h
@@ -80,9 +80,8 @@ struct got_object_id *got_object_id_dup(struct got_obj
  * path in the tree of the specified commit.
  * The caller should dispose of it with free(3).
  */
-const struct got_error *
-got_object_id_by_path(struct got_object_id **, struct got_repository *,
-    struct got_object_id *, const char *);
+const struct got_error *got_object_id_by_path(struct got_object_id **,
+    struct got_repository *, struct got_object_id *, const char *);
 
 /*
  * Obtain the type of an object.
@@ -96,16 +95,14 @@ const struct got_error *got_object_get_type(int *, str
  * to the ID of an existing object in the repository.
  * The caller should dispose of the ID with free(3).
  */
-const struct got_error *
-got_object_resolve_id_str(struct got_object_id **, struct got_repository *,
-    const char *);
+const struct got_error *got_object_resolve_id_str(struct got_object_id **,
+    struct got_repository *, const char *);
 
 /*
  * Attempt to open a commit object in a repository.
  * The caller must dispose of the commit with got_object_commit_close().
  */
-const struct got_error *
-got_object_open_as_commit(struct got_commit_object **,
+const struct got_error *got_object_open_as_commit(struct got_commit_object **,
     struct got_repository *, struct got_object_id *);
 
 /* Dispose of a commit object. */
@@ -146,8 +143,7 @@ const char *got_object_commit_get_logmsg(struct got_co
  * Attempt to open a tree object in a repository.
  * The caller must dispose of the tree with got_object_tree_close().
  */
-const struct got_error *
-got_object_open_as_tree(struct got_tree_object **,
+const struct got_error *got_object_open_as_tree(struct got_tree_object **,
     struct got_repository *, struct got_object_id *);
 
 /* Dispose of a tree object. */
@@ -171,8 +167,7 @@ const struct got_error *got_object_tree_path_changed(i
  * The size_t argument specifies the block size of an associated read buffer.
  * The caller must dispose of the blob with got_object_blob_close().
  */
-const struct got_error *
-got_object_open_as_blob(struct got_blob_object **,
+const struct got_error *got_object_open_as_blob(struct got_blob_object **,
     struct got_repository *, struct got_object_id *, size_t);
 
 /* Dispose of a blob object. */
blob - 239c9dff0f4d146d3ebd9391879d1b2ef9d9ef70
blob + cf87b34c6f7c83a5f08e9ad6eeb9048e658e0942
--- include/got_reference.h
+++ include/got_reference.h
@@ -30,7 +30,7 @@ struct got_object_id;
  * Attempt to open the reference with the provided name in a repository.
  * The caller must dispose of it with got_ref_close().
  */
-const struct got_error * got_ref_open(struct got_reference **,
+const struct got_error *got_ref_open(struct got_reference **,
     struct got_repository *, const char *);
 
 /*
blob - 3908cf70ae58c988b8d20322cb755f391ac31264
blob + c8d82fa3f0887124cf337b9f7ac8678c47ea8ddc
--- include/got_worktree.h
+++ include/got_worktree.h
@@ -74,7 +74,7 @@ const struct got_error *got_worktree_match_path_prefix
  * Get the name of a work tree's HEAD reference.
  * The caller must dispose of it with free(3).
  */
-char  *got_worktree_get_head_ref_name(struct got_worktree *);
+char *got_worktree_get_head_ref_name(struct got_worktree *);
 
 /*
  * Get the work tree's HEAD reference.
@@ -121,9 +121,8 @@ typedef const struct got_error *(*got_worktree_status_
  * The status callback will be invoked with the provided void * argument,
  * a path, and a corresponding status code.
  */
-const struct got_error *
-got_worktree_status(struct got_worktree *, const char *,
-    struct got_repository *, got_worktree_status_cb, void *,
+const struct got_error *got_worktree_status(struct got_worktree *,
+    const char *, struct got_repository *, got_worktree_status_cb, void *,
     got_worktree_cancel_cb cancel_cb, void *);
 
 /*