| commit | 6560584494a8053431d0c8e90b78d50f71c8055b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Oct 2015 19:30:21 +0000 (5 12:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Oct 2015 19:30:22 +0000 (5 12:30 -0700) | ||
| tree | 58b98a1dfccd4cce516f15effaa77652cfe7dc05 | treesnapshot (tar.gz zip) |
| parent | 96090283e0ba646c599b6a15834bdbb8dd731b4a | commitdiff |
| parent | 82e0668cde032379095b0581609c73646e9eb92a | commitdiff |
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
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 |