Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/merge-one-file-working-tree'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 6 May 2011 17:54:08 +0000
(10:54 -0700)
committer
Junio 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
raw
|
combined
(merge:
22dbeee
6aaeca9
)
diff --cc
git-merge-one-file.sh
Simple merge