My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a8c740 82e0668)
Merge branch 'jk/rebase-no-autostash' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2015 22:05:00 +0000 (14:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2015 22:05:01 +0000 (14:05 -0800)
commit697bd2871cd04357ced89b962d39eb685dab47ca
tree05a5149048de941a465151fa6e4488b65a319f4etree | snapshot
parent9a8c740225bbd551d85a353a7bd33d57aafaca06commit | diff
parent82e0668cde032379095b0581609c73646e9eb92acommit | diff
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
Documentation/git-rebase.txt diff1 | diff2 | blob | history
git-rebase.sh diff1 | diff2 | blob | history
The core git plumbing