diff options
| author |  Luke Diamand <luke@diamand.org> | 2011-05-07 11:19:43 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-05-09 16:26:51 -0700 |
| commit | ecdba36da6143bc00ade66b655bcff910f3e93b3 (patch) | |
| tree | 3e9c1f21fb099e0ac58647d951676a7c275715ca /git-merge-resolve.sh | |
| parent | git-p4: add option to preserve user names (diff) | |
| download | tgif-ecdba36da6143bc00ade66b655bcff910f3e93b3.tar.xz | |
git-p4: small improvements to user-preservation
. Slightly more paranoid checking of results from 'p4 change'
. Remove superfluous "-G"
. Don't modify the username if it is unchanged.
. Add a comment in the change template to show what is
going to be done.
Signed-off-by: Luke Diamand <luke@diamand.org>
Acked-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