diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:07:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:07:06 -0700 |
| commit | 86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9 (patch) | |
| tree | e3d0929979a9874bc9864e9d48bd6daec4abc110 /commit.h | |
| parent | Start preparing for 1.9.1 (diff) | |
| parent | run-command: mark run_hook_with_custom_index as deprecated (diff) | |
| download | tgif-86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9.tar.xz | |
Merge branch 'bp/commit-p-editor' into maint
* bp/commit-p-editor:
run-command: mark run_hook_with_custom_index as deprecated
merge hook tests: fix and update tests
merge: fix GIT_EDITOR override for commit hook
commit: fix patch hunk editing with "commit -p -m"
test patch hunk editing with "commit -p -m"
merge hook tests: use 'test_must_fail' instead of '!'
merge hook tests: fix missing '&&' in test
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -304,4 +304,7 @@ extern void check_commit_signature(const struct commit* commit, struct signature int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused); +LAST_ARG_MUST_BE_NULL +extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); + #endif /* COMMIT_H */ |