diff options
author | Javi Merino <javi.merino@arm.com> | 2012-03-30 16:37:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 19:03:15 -0400 |
commit | 673d29f9a00b0c63ad3f4e2136eb4e181281fbfd (patch) | |
tree | d6e0b84f86cd93afda6e34c8a2f5d9342c126811 /Documentation/kbuild | |
parent | f52a759327b8b30fbf66da2d75961d2dbc7c6cfa (diff) |
Documentation: mention scripts/diffconfig tool
The kconfig documentation suggests using plain 'diff' to compare config
files and then adds "Yes, we need something better here". Commit
a717417e7f96 ("kconfig: add diffconfig utility") added what that comment
was looking for.
Signed-off-by: Javi Merino <javi.merino@arm.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/kbuild')
-rw-r--r-- | Documentation/kbuild/kconfig.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt index c313d71324b4..9d5f2a90dca9 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt | |||
@@ -28,12 +28,10 @@ new (default) values, so you can use: | |||
28 | 28 | ||
29 | grep "(NEW)" conf.new | 29 | grep "(NEW)" conf.new |
30 | 30 | ||
31 | to see the new config symbols or you can 'diff' the previous and | 31 | to see the new config symbols or you can use diffconfig to see the |
32 | new .config files to see the differences: | 32 | differences between the previous and new .config files: |
33 | 33 | ||
34 | diff .config.old .config | less | 34 | scripts/diffconfig .config.old .config | less |
35 | |||
36 | (Yes, we need something better here.) | ||
37 | 35 | ||
38 | ______________________________________________________________________ | 36 | ______________________________________________________________________ |
39 | Environment variables for '*config' | 37 | Environment variables for '*config' |