diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:07 -0700 |
| commit | 5e1288ac9e20aef893e554ed01906c8151646cac (patch) | |
| tree | 1b3fcb380c47c918c82967c3fe778172b0b5f3fb /diffcore-break.c | |
| parent | Merge branch 'ad/bisect-terms' (diff) | |
| parent | git-p4: fix P4 label import for unprocessed commits (diff) | |
| download | tgif-5e1288ac9e20aef893e554ed01906c8151646cac.tar.xz | |
Merge branch 'ld/p4-import-labels'
Correct "git p4 --detect-labels" so that it does not fail to create
a tag that points at a commit that is also being imported.
* ld/p4-import-labels:
git-p4: fix P4 label import for unprocessed commits
git-p4: do not terminate creating tag for unknown commit
git-p4: failing test for ignoring invalid p4 labels
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions