| commit | 697bd2871cd04357ced89b962d39eb685dab47ca | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Dec 2015 22:05:00 +0000 (8 14:05 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Dec 2015 22:05:01 +0000 (8 14:05 -0800) | ||
| tree | 05a5149048de941a465151fa6e4488b65a319f4e | treesnapshot (tar.gz zip) |
| parent | 9a8c740225bbd551d85a353a7bd33d57aafaca06 | commitdiff |
| parent | 82e0668cde032379095b0581609c73646e9eb92a | commitdiff |
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
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
| Documentation/git-rebase.txt | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |