![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Nov 2006 23:41:34 +0000 (15:41 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Nov 2006 23:41:34 +0000 (15:41 -0800) | ||
| commit | d0a75a179e0e872c47d4a25350565a8c7c04dd0b | |
| tree | 1614178fdd3c8477f762e4657a82334a23dbb17b | tree | snapshot |
| parent | 66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41 | commit | diff |
| parent | 5b329a5f5e3625cdc204e3d274c89646816f384c | commit | diff |
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.
* 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.
| merge-recursive.c | diff1 | | diff2 | | blob | history |