diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 16:39:23 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 16:39:23 +0400 |
| commit | 443f26cbcac66368eb0ec8a8a250bf5815ad0a10 (patch) | |
| tree | 0363e0e85d5009e9e042b4d22410c6d95373d805 /diff.c | |
| parent | 1b9fa0e81134df5c067efc1e3413f05c9e5043f8 (diff) | |
| parent | ac472ba65f75fbdbc52328f2bdc8645e5289e683 (diff) | |
Merge branch 'cb/assume-unchanged-fix' into maint
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions