list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Supporting untracked files with `git pull --autostash`
@ 2019-04-14 18:20 mqudsi
  0 siblings, 0 replies; only message in thread
From: mqudsi @ 2019-04-14 18:20 UTC (permalink / raw)
  To: git


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

    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


mqudsi@devpc > git status --porcelain=v2 | grep eval
? tests/eval.err
? tests/
? 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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-04-14 18:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-14 18:20 Supporting untracked files with `git pull --autostash` mqudsi

Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).