Merge branch 'nd/use-opt-int-set-f'

Code simplification.

* nd/use-opt-int-set-f:
Use OPT_SET_INT_F() for cmdline option specification

diff --cc builtin/am.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/difftool.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/ls-files.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/notes.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge