projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8619380 d249610)
Merge branch 'ph/parseopt'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:19:08 +0000 (10:19 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:19:08 +0000 (10:19 -0700)
* ph/parseopt:
  parse-opt: migrate builtin-merge-file.
  parse-opt: migrate git-merge-base.
  parse-opt: migrate fmt-merge-msg.


Trivial merge
Git—the stupid content tracker