![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800) | ||
| commit | 8d7ac73014b438fee5a811340d682ece61dda268 | |
| tree | 171379178b230d8a4d3a965fad61655657ea7b7e | tree | snapshot |
| parent | 7010146f90abf0e4954690f6cd38a8463786fec7 | commit | diff |
| parent | a080558ed77952b2394499531edc324eb2885d67 | commit | diff |
Merge branch 'ld/git-p4-branches-and-labels'
* ld/git-p4-branches-and-labels:
git-p4: label import fails with multiple labels at the same changelist
git-p4: add test for p4 labels
git-p4: importing labels should cope with missing owner
git-p4: cope with labels with empty descriptions
git-p4: handle p4 branches and labels containing shell chars
* ld/git-p4-branches-and-labels:
git-p4: label import fails with multiple labels at the same changelist
git-p4: add test for p4 labels
git-p4: importing labels should cope with missing owner
git-p4: cope with labels with empty descriptions
git-p4: handle p4 branches and labels containing shell chars
| contrib/fast-import/git-p4 | diff1 | | diff2 | | blob | history |