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 /builtin-read-tree.c | |
| parent | Merge branch 'np/index-pack' (diff) | |
| parent | t6022: ignoring untracked files by merge-recursive when they do not matter (diff) | |
| download | tgif-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 'builtin-read-tree.c')
0 files changed, 0 insertions, 0 deletions