diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-07 15:41:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-07 15:41:34 -0800 |
| commit | d0a75a179e0e872c47d4a25350565a8c7c04dd0b (patch) | |
| tree | 1614178fdd3c8477f762e4657a82334a23dbb17b /cache.h | |
| parent | 66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41 (diff) | |
| parent | 5b329a5f5e3625cdc204e3d274c89646816f384c (diff) | |
| download | git-d0a75a179e0e872c47d4a25350565a8c7c04dd0b.tar.gz git-d0a75a179e0e872c47d4a25350565a8c7c04dd0b.tar.xz | |
Merge branch 'jc/read-tree'
* jc/read-tree:
t6022: ignoring untracked files by merge-recursive when they do not matter
merge-recursive: adjust to loosened "working file clobbered" check
merge-recursive: make a few functions static.
merge-recursive: use abbreviated commit object name.
merge: loosen overcautious "working file will be lost" check.
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions