summaryrefslogtreecommitdiff
path: root/builtin/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-05 19:30:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-05 19:30:22 (GMT)
commit6560584494a8053431d0c8e90b78d50f71c8055b (patch)
tree58b98a1dfccd4cce516f15effaa77652cfe7dc05 /builtin/remote.c
parent96090283e0ba646c599b6a15834bdbb8dd731b4a (diff)
parent82e0668cde032379095b0581609c73646e9eb92a (diff)
downloadgit-6560584494a8053431d0c8e90b78d50f71c8055b.zip
git-6560584494a8053431d0c8e90b78d50f71c8055b.tar.gz
git-6560584494a8053431d0c8e90b78d50f71c8055b.tar.bz2
Merge branch 'jk/rebase-no-autostash'
There was no way to defeat a configured rebase.autostash variable from the command line, as "git rebase --no-autostash" was missing. * jk/rebase-no-autostash: Documentation/git-rebase: fix --no-autostash formatting rebase: support --no-autostash
Diffstat (limited to 'builtin/remote.c')
0 files changed, 0 insertions, 0 deletions