]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f34a941 5eac739)
Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
authorJunio C Hamano <gitster@pobox.com>
Sat, 30 Aug 2008 23:03:40 +0000 (16:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 30 Aug 2008 23:03:40 +0000 (16:03 -0700)
* 'jc/post-simplify' (early part):
  revision --simplify-merges: make it a no-op without pathspec
  revision --simplify-merges: do not leave commits unprocessed
  revision --simplify-merges: use decoration instead of commit->util field


Trivial merge
Git mirror and local development