summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorLibravatar Romain Merland <merlorom@yahoo.fr>2018-06-01 09:46:14 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-12 14:45:16 -0700
commitf55b87c1c748cdec7ce1631e6296e3edfd7cfc7d (patch)
tree51b21c9b89aa6b67822d22df31bad18579185496 /diffcore-pickaxe.c
parentThe fifth batch for 2.18 (diff)
downloadtgif-f55b87c1c748cdec7ce1631e6296e3edfd7cfc7d.tar.xz
git-p4: add options --commit and --disable-rebase
On a daily work with multiple local git branches, the usual way to submit only a specified commit was to cherry-pick the commit on master then run git-p4 submit. It can be very annoying to switch between local branches and master, only to submit one commit. The proposed new way is to select directly the commit you want to submit. Add option --commit to command 'git-p4 submit' in order to submit only specified commit(s) in p4. On a daily work developping software with big compilation time, one may not want to rebase on his local git tree, in order to avoid long recompilation. Add option --disable-rebase to command 'git-p4 submit' in order to disable rebase after submission. Thanks-to: Cedric Borgese <cedric.borgese@gmail.com> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Romain Merland <merlorom@yahoo.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions