projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 66f3b35 5b329a5)
Merge branch 'jc/read-tree'
authorJunio C Hamano <junkio@cox.net>
Tue, 7 Nov 2006 23:41:34 +0000 (15:41 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 7 Nov 2006 23:41:34 +0000 (15:41 -0800)
commitd0a75a179e0e872c47d4a25350565a8c7c04dd0b
tree1614178fdd3c8477f762e4657a82334a23dbb17btree | snapshot
parent66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41commit | diff
parent5b329a5f5e3625cdc204e3d274c89646816f384ccommit | 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.
merge-recursive.c diff1 | diff2 | blob | history
Git—the stupid content tracker