diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:22 -0700 |
| commit | 6560584494a8053431d0c8e90b78d50f71c8055b (patch) | |
| tree | 58b98a1dfccd4cce516f15effaa77652cfe7dc05 /builtin/diff.c | |
| parent | Merge branch 'jk/make-findstring-makeflags-fix' (diff) | |
| parent | Documentation/git-rebase: fix --no-autostash formatting (diff) | |
| download | tgif-6560584494a8053431d0c8e90b78d50f71c8055b.tar.xz | |
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/diff.c')
0 files changed, 0 insertions, 0 deletions