Merge branch 'sb/opt-filename'

* sb/opt-filename:
  parse-opts: add OPT_FILENAME and transition builtins
  parse-opts: prepare for OPT_FILENAME

Conflicts:
	builtin-log.c

diff --cc builtin-apply.c
Simple merge

diff --cc builtin-cat-file.c
Simple merge

diff --cc builtin-fetch.c
Simple merge

diff --cc builtin-log.c
Simple merge

diff --cc builtin-remote.c
Simple merge

diff --cc builtin-revert.c
Simple merge