diff options
| author | Luke Diamand <luke@diamand.org> | 2017-12-21 11:06:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-22 13:30:52 -0800 |
| commit | 8cf422dbf1b4bc14a970b7ff5c5fa555f61dd9ed (patch) | |
| tree | e3e354548203d51e5fbfdbd704e4e94139b1c597 /log-tree.h | |
| parent | 936d1b989416a95f593bf81ccae8ac62cd83f279 (diff) | |
| download | git-8cf422dbf1b4bc14a970b7ff5c5fa555f61dd9ed.tar.gz git-8cf422dbf1b4bc14a970b7ff5c5fa555f61dd9ed.tar.xz | |
git-p4: update multiple shelved change lists
--update-shelve can now be specified multiple times on the
command-line, to update multiple shelved changelists in a single
submit.
This then means that a git patch series can be mirrored to a
sequence of shelved changelists, and (relatively easily) kept in
sync as changes are made in git.
Note that Perforce does not really support overlapping shelved
changelists where one change touches the files modified by
another. Trying to do this will result in merge conflicts.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.h')
0 files changed, 0 insertions, 0 deletions