summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-17 15:07:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-17 15:07:50 -0700
commite69b40828070b71c423820d1e35d5fb1e5b1a550 (patch)
treef6cb843ebe7caa8b57074cf41ab5d4fdcf6270c8 /contrib
parentSecond batch for 2.6 (diff)
parentpull: allow dirty tree when rebase.autostash enabled (diff)
downloadtgif-e69b40828070b71c423820d1e35d5fb1e5b1a550.tar.xz
Merge branch 'kd/pull-rebase-autostash'
"git pull --rebase" has been taught to pay attention to rebase.autostash configuration. * kd/pull-rebase-autostash: pull: allow dirty tree when rebase.autostash enabled
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions