]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 714cdcd df217ed)
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
tree7479d66d97277f47490de10e204cfcbc0a123885tree | snapshot
parent714cdcd03e2caac6e2dc8d94debc7c800742f546commit | diff
parentdf217ed6430efe444a09fffdafd39720ae3f9864commit | diff
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 diff1 | diff2 | blob | history
builtin-cat-file.c diff1 | diff2 | blob | history
builtin-fetch.c diff1 | diff2 | blob | history
builtin-log.c diff1 | diff2 | blob | history
builtin-remote.c diff1 | diff2 | blob | history
builtin-revert.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.