]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a613b53 6aaeca9)
Merge branch 'jk/merge-one-file-working-tree' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:19 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:19 +0000 (10:44 -0700)
commit8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af
tree877e3cbaafa693fb8752acf55a693a27b15f9737tree | snapshot
parenta613b534bca2d56f2ad67b3a7f0cf2b34f031260commit | diff
parent6aaeca900b05a8265d1930d3dc0a2df19002771fcommit | diff
Merge branch 'jk/merge-one-file-working-tree' into maint

* jk/merge-one-file-working-tree:
  merge-one-file: fix broken merges with alternate work trees
  add tests for merge-index / merge-one-file
git-merge-one-file.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.