]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95e42a6 ac472ba)
Merge branch 'cb/assume-unchanged-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:11 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:11 +0000 (11:21 -0700)
* cb/assume-unchanged-fix:
  Documentation: git-add does not update files marked "assume unchanged"
  do not overwrite files marked "assume unchanged"

1  2 
unpack-trees.c patch | diff1 | diff2 | blob | history

diff --cc unpack-trees.c
Simple merge
Git mirror and local development