summary refs log tree commit diff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-26 14:59:03 -0700
committerJunio C Hamano <gitster@pobox.com>2021-03-26 14:59:03 -0700
commit89519f662c9e2b1c406fa72ba7923fcf5c028e89 (patch)
tree377d0feee3a6b52752c135c8d8457c898539768b /commit.h
parentfde07fc356783bd05695cd3826844f1590ac2e45 (diff)
parent00ea64ed7a0ee5ef0901b1eeb5add6954925590f (diff)
Merge branch 'cm/rebase-i-fixup-amend-reword'
"git commit --fixup=<commit>", which was to tweak the changes made
to the contents while keeping the original log message intact,
learned "--fixup=(amend|reword):<commit>", that can be used to
tweak both the message and the contents, and only the message,
respectively.

* cm/rebase-i-fixup-amend-reword:
  doc/git-commit: add documentation for fixup=[amend|reword] options
  t3437: use --fixup with options to create amend! commit
  t7500: add tests for --fixup=[amend|reword] options
  commit: add a reword suboption to --fixup
  commit: add amend suboption to --fixup to create amend! commit
  sequencer: export and rename subject_length()
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 49c0f50396..df42eb434f 100644
--- a/commit.h
+++ b/commit.h
@@ -167,6 +167,9 @@ const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
 /* Find beginning and length of commit subject. */
 int find_commit_subject(const char *commit_buffer, const char **subject);
 
+/* Return length of the commit subject from commit log message. */
+size_t commit_subject_length(const char *body);
+
 struct commit_list *commit_list_insert(struct commit *item,
 					struct commit_list **list);
 int commit_list_contains(struct commit *item,