projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06cfa8a 8b13026)
Merge branch 'aw/git-p4-deletion'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:42:46 +0000 (10:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:42:46 +0000 (10:42 -0700)
* aw/git-p4-deletion:
  Fix handling of git-p4 on deleted files


Trivial merge
Git—the stupid content tracker