diff options
| author |  Pete Wyckoff <pw@padd.com> | 2013-01-14 19:47:06 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-01-15 09:46:30 -0800 |
| commit | 8c9e8b6e756cce90797e19dc64e3b51426546cf3 (patch) | |
| tree | 98b4029c4be49401300478584af1d4896f46b80b /git-merge-resolve.sh | |
| parent | git p4: fail gracefully on sync with no master branch (diff) | |
| download | tgif-8c9e8b6e756cce90797e19dc64e3b51426546cf3.tar.xz | |
git p4: fix sync --branch when no master branch
It is legal to sync a branch with a different name than
refs/remotes/p4/master, and to do so even when master does
not exist.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions