]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e05aae6 bf74106)
Merge branch 'do/maint-merge-recursive-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:50 +0000 (01:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:50 +0000 (01:39 -0700)
commitd32643c0ff6d74b967b65e867f1f99dba840836e
tree1c667614f8a1ec71fa79150d3cac03197fb4ae60tree | snapshot
parente05aae684d453695bc5bd1e66aa96bc7d42e186acommit | diff
parentbf74106a5b4577fd695d15a28ad51537ae7470d8commit | diff
Merge branch 'do/maint-merge-recursive-fix'

* do/maint-merge-recursive-fix:
  merge-recursive: never leave index unmerged while recursing
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.