git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Tue, 10 Jan 2017 23:27:30 +0000 (15:27 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 10 Jan 2017 23:27:30 +0000 (15:27 -0800)
commit	c733e274100eea3e3468f61756235c79d5d24dd4
tree	74581fa681bc697860b94725a8bdd177ea33c856	tree \| snapshot
parent	1fc2000a92419bf9d9020df4ab154c5632c278bf	commit \| diff
parent	bc233524c96518c04650d297ad81a9c948fc2e41	commit \| diff

Merge branch 'ls/p4-retry-thrice' into next

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