diff options
| author | Javi Merino <javi.merino@arm.com> | 2012-03-30 13:37:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 16:03:15 -0700 |
| commit | 673d29f9a00b0c63ad3f4e2136eb4e181281fbfd (patch) | |
| tree | d6e0b84f86cd93afda6e34c8a2f5d9342c126811 /Documentation/kbuild | |
| parent | f52a759327b8b30fbf66da2d75961d2dbc7c6cfa (diff) | |
| download | linux-3.10-673d29f9a00b0c63ad3f4e2136eb4e181281fbfd.tar.gz linux-3.10-673d29f9a00b0c63ad3f4e2136eb4e181281fbfd.tar.bz2 linux-3.10-673d29f9a00b0c63ad3f4e2136eb4e181281fbfd.zip | |
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 c313d71324b..9d5f2a90dca 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt @@ -28,12 +28,10 @@ new (default) values, so you can use: grep "(NEW)" conf.new -to see the new config symbols or you can 'diff' the previous and -new .config files to see the differences: +to see the new config symbols or you can use diffconfig to see the +differences between the previous and new .config files: - diff .config.old .config | less - -(Yes, we need something better here.) + scripts/diffconfig .config.old .config | less ______________________________________________________________________ Environment variables for '*config' |