]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commitf9275c68af58e0f65e1557b5109ccbfdbbbc384a
tree7479d66d97277f47490de10e204cfcbc0a123885
parent714cdcd03e2caac6e2dc8d94debc7c800742f546
parentdf217ed6430efe444a09fffdafd39720ae3f9864
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
builtin-apply.c
builtin-cat-file.c
builtin-fetch.c
builtin-log.c
builtin-remote.c
builtin-revert.c