diff options
author | Jeff King <peff@peff.net> | 2016-10-27 13:30:30 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-27 10:36:45 -0700 |
commit | 5c238e29a85dd109e42513c6a9d09008d8839bae (patch) | |
tree | e88aabedd7ee8128b612d829e63f8355f3bf8bcf /Documentation/howto/revert-a-faulty-merge.txt | |
parent | Merge branch 'jk/common-main-2.8' into jk/common-main (diff) | |
download | tgif-5c238e29a85dd109e42513c6a9d09008d8839bae.tar.xz |
git-compat-util: move content inside ifdef/endif guards
Commit 3f2e2297b9 (add an extra level of indirection to
main(), 2016-07-01) added a declaration to git-compat-util.h,
but it was accidentally placed after the final #endif that
guards against multiple inclusions.
This doesn't have any actual impact on the code, since it's
not incorrect to repeat a function declaration in C. But
it's a bad habit, and makes it more likely for somebody else
to make the same mistake. It also defeats gcc's optimization
to avoid opening header files whose contents are completely
guarded.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions