granicus.if.org Git - git/commit

]> granicus.if.org Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Wed, 18 Jan 2017 23:12:12 +0000 (15:12 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 18 Jan 2017 23:12:12 +0000 (15:12 -0800)
commit	74f7427f8a7a6f8ac87e9f1bb1b140cd034f428d
tree	a13bab342f4d0161f57d2d0a46456d264a962b77	tree \| snapshot
parent	3ccd681c2ab11522591be8a7a3eddb1a85a43ab0	commit \| diff
parent	bc233524c96518c04650d297ad81a9c948fc2e41	commit \| diff

Merge branch 'ls/p4-retry-thrice'

A recent updates to "git p4" was not usable for older p4 but it
could be made to work with minimum changes. Do so.

* ls/p4-retry-thrice:
git-p4: do not pass '-r 0' to p4 commands

Documentation/git-p4.txt	diff1 \|	diff2 \|	blob \| history
git-p4.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/git-p4.txt	diff1 \|	diff2 \|	blob \| history
git-p4.py	diff1 \|	diff2 \|	blob \| history