projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b9fa0e ac472ba)
Merge branch 'cb/assume-unchanged-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:39:23 +0000 (05:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:39:23 +0000 (05:39 -0700)
* cb/assume-unchanged-fix:
  Documentation: git-add does not update files marked "assume unchanged"
  do not overwrite files marked "assume unchanged"


Trivial merge
Git—the stupid content tracker