Merge branch 'nd/use-opt-int-set-f'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2018 06:06:38 +0000 (15:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2018 06:06:38 +0000 (15:06 +0900)
Code simplification.

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

1  2 
builtin/am.c
builtin/branch.c
builtin/difftool.c
builtin/fetch.c
builtin/grep.c
builtin/ls-files.c
builtin/merge.c
builtin/notes.c
builtin/pack-objects.c

diff --cc builtin/am.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/grep.c
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc builtin/notes.c
Simple merge
Simple merge