summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Chris Rorvick <chris@rorvick.com>2012-12-02 21:27:50 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-03 08:04:08 -0800
commit1184564eac8ef6c82da068a31f60aee0d6870265 (patch)
tree72309ffafe3d453c9ea44cc3d3691338bcbd942a /git-rebase--merge.sh
parentpush: cleanup push rules comment (diff)
downloadtgif-1184564eac8ef6c82da068a31f60aee0d6870265.tar.xz
push: rename config variable for more general use
The 'pushNonFastForward' advice config can be used to squelch several instances of push-related advice. Rename it to 'pushUpdateRejected' to cover other reject scenarios that are unrelated to fast-forwarding. Retain the old name for compatibility. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions