Merge branch 'dl/opt-callback-cleanup'

Code cleanup.

* dl/opt-callback-cleanup:
  Use OPT_CALLBACK and OPT_CALLBACK_F

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/clean.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/log.c
Simple merge

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

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/pull.c
Simple merge

diff --cc builtin/push.c
Simple merge

diff --cc builtin/rebase.c
Simple merge