On 03/13/2012 08:12 AM, Javi Merino wrote: > The kconfig documentation suggests using plain 'diff' to compare > config files and then adds "Yes, we need something better here". > "a717417 kconfig: add diffconfig utility" added what that comment was > looking for. > > Cc: Michal Marek <mmarek@xxxxxxx> > Signed-off-by: Javi Merino <javi.merino@xxxxxxx> Applied, thanks. > --- > 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 c313d71..9d5f2a9 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' -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
