Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
author
Junio C Hamano
<gitster@pobox.com>
Tue, 17 Jan 2017 23:11:07 +0000
(15:11 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 17 Jan 2017 23:11:08 +0000
(15:11 -0800)
"git p4" misbehaved when swapping a directory and a symbolic link.
* ld/p4-compare-dir-vs-symlink:
git-p4: avoid crash adding symlinked directory
1
2
git-p4.py
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
af04b11
df8a9e8
)
diff --cc
git-p4.py
Simple merge