Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'gv/mingw-p4-mapuser'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000
(13:36 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000
(13:36 -0800)
"git p4" did not work well with multiple git-p4.mapUser entries on
Windows.
* gv/mingw-p4-mapuser:
git-p4: fix git-p4.mapUser on Windows
1
2
git-p4.py
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
6f1c08b
c3c2b05
)
diff --cc
git-p4.py
Simple merge