]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22dbeee 6aaeca9)
Merge branch 'jk/merge-one-file-working-tree'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:54:08 +0000 (10:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:54:08 +0000 (10:54 -0700)
* jk/merge-one-file-working-tree:
  merge-one-file: fix broken merges with alternate work trees
  add tests for merge-index / merge-one-file

1  2 
git-merge-one-file.sh patch | diff1 | diff2 | blob | history

diff --cc git-merge-one-file.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.