projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd1727f 60df071)
Merge branch 'ld/git-p4-expanded-keywords'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:31 +0000 (13:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:31 +0000 (13:30 -0800)
commitd065f687452a666c74f353306bb14debe48e40d3
tree275b59fe9f16903a0c7b1ebbecd74aeb7778afa7tree | snapshot
parentfd1727f5fa1ca1817eee36f99c9245dc2217ecaccommit | diff
parent60df071c6cce6ee3f92f62042da11c62fe113817commit | diff
Merge branch 'ld/git-p4-expanded-keywords'

* ld/git-p4-expanded-keywords:
  : Teach git-p4 to unexpand $RCS$-like keywords that are embedded in
  : tracked contents in order to reduce unnecessary merge conflicts.
  git-p4: add initial support for RCS keywords
contrib/fast-import/git-p4 diff1 | diff2 | blob | history
Git—the stupid content tracker