diff options
| author |  Mehul Jain <mehul.jain2029@gmail.com> | 2016-04-02 23:28:32 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-04 11:15:02 -0700 |
| commit | 450dd1dce1fbf6a6743e74d6aef750068fc5069c (patch) | |
| tree | 0ba7224831ac29269f72255a18934c15d3653316 /lockfile.c | |
| parent | t5520: reduce commom lines of code (diff) | |
| download | tgif-450dd1dce1fbf6a6743e74d6aef750068fc5069c.tar.xz | |
t5520: test --[no-]autostash with pull.rebase=true
The "--[no-]autostash" options for git-pull are only valid in
rebase mode (i.e. either --rebase is used or pull.rebase=true).
Existing tests already check the cases when --rebase is used but
fail to check for pull.rebase=true case.
Add two new tests to check that the --[no-]autostash options work
with pull.rebase=true.
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions