diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:01 -0800 |
| commit | 697bd2871cd04357ced89b962d39eb685dab47ca (patch) | |
| tree | 05a5149048de941a465151fa6e4488b65a319f4e /t/t4017-diff-retval.sh | |
| parent | Prepare for 2.6.4 (diff) | |
| parent | Documentation/git-rebase: fix --no-autostash formatting (diff) | |
| download | tgif-697bd2871cd04357ced89b962d39eb685dab47ca.tar.xz | |
Merge branch 'jk/rebase-no-autostash' into maint
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 't/t4017-diff-retval.sh')
0 files changed, 0 insertions, 0 deletions