Merge branch 'sb/opt-filename'
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 23:57:42 +0000 (16:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 23:57:42 +0000 (16:57 -0700)
* sb/opt-filename:
  parse-opts: add OPT_FILENAME and transition builtins
  parse-opts: prepare for OPT_FILENAME

Conflicts:
builtin-log.c

1  2 
builtin-apply.c
builtin-cat-file.c
builtin-fetch.c
builtin-log.c
builtin-remote.c
builtin-revert.c

diff --cc builtin-apply.c
Simple merge
Simple merge
diff --cc builtin-fetch.c
Simple merge
diff --cc builtin-log.c
Simple merge
Simple merge
Simple merge