diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-17 15:07:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-17 15:07:50 -0700 |
| commit | e69b40828070b71c423820d1e35d5fb1e5b1a550 (patch) | |
| tree | f6cb843ebe7caa8b57074cf41ab5d4fdcf6270c8 /convert.h | |
| parent | 130be8eeb8b9b7c89751c3cab3bc54dc6f2d43e6 (diff) | |
| parent | 53c76dc05e0b5ad5b1f92db9577694e896d67a0a (diff) | |
| download | git-e69b40828070b71c423820d1e35d5fb1e5b1a550.tar.gz git-e69b40828070b71c423820d1e35d5fb1e5b1a550.tar.xz | |
Merge branch 'kd/pull-rebase-autostash'
"git pull --rebase" has been taught to pay attention to
rebase.autostash configuration.
* kd/pull-rebase-autostash:
pull: allow dirty tree when rebase.autostash enabled
Diffstat (limited to 'convert.h')
0 files changed, 0 insertions, 0 deletions