Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ls/p4-tmp-refs'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 19 Jul 2016 20:22:24 +0000
(13:22 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 19 Jul 2016 20:22:24 +0000
(13:22 -0700)
"git p4" used a location outside $GIT_DIR/refs/ to place its
temporary branches, which has been moved to refs/git-p4-tmp/.
* ls/p4-tmp-refs:
git-p4: place temporary refs used for branch import under refs/git-p4-tmp
1
2
git-p4.py
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
3d55eea
d604176
)
diff --cc
git-p4.py
Simple merge