summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2018-06-08 21:32:43 +0100
committerJunio C Hamano <gitster@pobox.com>2018-06-12 14:46:08 -0700
commit3b3477ea5ae0a443ecceaf588c41cbc937066260 (patch)
tree66181c0905b089532435b72af13d0f125a81ec98 /merge-blobs.h
parentf55b87c1c748cdec7ce1631e6296e3edfd7cfc7d (diff)
downloadgit-3b3477ea5ae0a443ecceaf588c41cbc937066260.tar.gz
git-p4: disable-rebase: allow setting this via configuration
This just lets you set the --disable-rebase option with the git configuration options git-p4.disableRebase. If you're using this option, you probably want to set it all the time for a given repo. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions