git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e1149fd 123f631)

author	Junio C Hamano <redacted>
	Fri, 1 Jun 2018 06:06:38 +0000 (15:06 +0900)
committer	Junio C Hamano <redacted>
	Fri, 1 Jun 2018 06:06:38 +0000 (15:06 +0900)
commit	caf0c98c63ac4b79a3a2e3952863b68740face10
tree	17aa982e1a802b714471da7043a682237cce59b3	tree \| snapshot
parent	e1149fd7d95e3b63f56d4360e135428fc3f7eb82	commit \| diff
parent	123f631761dab8c37391ba1584122c2578f51923	commit \| diff

Merge branch 'ld/p4-unshelve'

"git p4" learned to "unshelve" shelved commit from P4.

* ld/p4-unshelve:
git-p4: add unshelve command

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

git clone https://git.99rst.org/PROJECT