diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:29 -0800 |
| commit | 6bd396be0f9c87c2a7012d43eddc3c57f40a169b (patch) | |
| tree | b689306d47202f5796005ec752e8d8829c1fec74 /builtin | |
| parent | 00c4d2b6bca954b4505221616dd3f53230f9b299 (diff) | |
| parent | d0e63260261f166b1e19ae4050404a9a71934dbe (diff) | |
| download | git-6bd396be0f9c87c2a7012d43eddc3c57f40a169b.tar.gz git-6bd396be0f9c87c2a7012d43eddc3c57f40a169b.tar.xz | |
Merge branch 'ot/pretty'
Code clean-up.
* ot/pretty:
format: create docs for pretty.h
format: create pretty.h file
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/notes.c | 2 | ||||
| -rw-r--r-- | builtin/reset.c | 2 | ||||
| -rw-r--r-- | builtin/show-branch.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 1a2c7d92a..7c8176164 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -12,7 +12,7 @@ #include "builtin.h" #include "notes.h" #include "blob.h" -#include "commit.h" +#include "pretty.h" #include "refs.h" #include "exec_cmd.h" #include "run-command.h" diff --git a/builtin/reset.c b/builtin/reset.c index 906e54165..e15f59579 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -12,7 +12,7 @@ #include "lockfile.h" #include "tag.h" #include "object.h" -#include "commit.h" +#include "pretty.h" #include "run-command.h" #include "refs.h" #include "diff.h" diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 2e24b5c33..e8a4aa40c 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -1,6 +1,6 @@ #include "cache.h" #include "config.h" -#include "commit.h" +#include "pretty.h" #include "refs.h" #include "builtin.h" #include "color.h" |