Skip to content

Commit 4615a8c

Browse files
newrengitster
authored andcommitted
merge-recursive: alphabetize include list
Other than cache.h which needs to appear first, and merge-recursive.h which I want to be second so that we are more likely to notice if merge-recursive.h has any missing includes, the rest of the list is long and easier to look through if it's alphabetical. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 45ef16f commit 4615a8c

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

merge-recursive.c

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,31 @@
44
* The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
55
*/
66
#include "cache.h"
7-
#include "config.h"
7+
#include "merge-recursive.h"
8+
89
#include "advice.h"
9-
#include "lockfile.h"
10-
#include "cache-tree.h"
11-
#include "object-store.h"
12-
#include "repository.h"
13-
#include "commit.h"
10+
#include "alloc.h"
11+
#include "attr.h"
1412
#include "blob.h"
1513
#include "builtin.h"
16-
#include "tree-walk.h"
14+
#include "cache-tree.h"
15+
#include "commit.h"
16+
#include "commit-reach.h"
17+
#include "config.h"
1718
#include "diff.h"
1819
#include "diffcore.h"
20+
#include "dir.h"
21+
#include "ll-merge.h"
22+
#include "lockfile.h"
23+
#include "object-store.h"
24+
#include "repository.h"
25+
#include "revision.h"
26+
#include "string-list.h"
27+
#include "submodule.h"
1928
#include "tag.h"
20-
#include "alloc.h"
29+
#include "tree-walk.h"
2130
#include "unpack-trees.h"
22-
#include "string-list.h"
2331
#include "xdiff-interface.h"
24-
#include "ll-merge.h"
25-
#include "attr.h"
26-
#include "merge-recursive.h"
27-
#include "dir.h"
28-
#include "submodule.h"
29-
#include "revision.h"
30-
#include "commit-reach.h"
3132

3233
struct merge_options_internal {
3334
int call_depth;

0 commit comments

Comments
 (0)