# Supporting untracked files with `git pull --autostash`

1 messages from 2019-04-14 to 2019-04-14. Participants: mqudsi@neosmart.net.
Thread: https://gitlist.dev/t/50933

## mqudsi@neosmart.net, 2019-04-14 18:20

Subject: Supporting untracked files with `git pull --autostash`
Message-ID: <0101016a1d14099f-4ac42e38-256a-42a2-94d3-430417d74a25-000000@us-west-2.amazonses.com>
URL: https://gitlist.dev/e/0101016a1d14099f-4ac42e38-256a-42a2-94d3-430417d74a25-000000%40us-west-2.amazonses.com

```
Hello,

Just a quick request for an enhancement to the behavior of the following
command:

    git pull --autostash --rebase

When executed with local, untracked files that would conflict with newly-added
files upstream, e.g.

An untracked local file `master:/foo` would be overwritten by a recently tracked
file `origin/master:/foo`.

Currently, the following occurs:

ˋˋˋ
mqudsi@devpc > git pull --autostash --rebase
First, rewinding head to replay your work on top of it...
error: The following untracked working tree files would be overwritten by
checkout:
        tests/eval.err
		tests/eval.in
		tests/eval.out
ˋˋˋ

where

ˋˋˋ
mqudsi@devpc > git status --porcelain=v2 | grep eval
? tests/eval.err
? tests/eval.in
? tests/eval.out
ˋˋˋ

As currently `--autostash` only applies to files that are tracked by git, and
files not in the index are ignored.

(Additionally, with this change it makes sense to enable `--autostash` to be used
with a plain `git pull` without necessary also including `--rebase`, but I can
live without it!)

Thank you,

Mahmoud Al-Qudsi
NeoSmart Technologies



```