* An option to ignore submodules in stash push?
@ 2018-02-06 15:56 Robert Dailey
2018-02-06 22:24 ` Stefan Beller
0 siblings, 1 reply; 2+ messages in thread
From: Robert Dailey @ 2018-02-06 15:56 UTC (permalink / raw)
To: Git
I haven't seen such an option, but I think it would be nice to be able
to ignore submodules when creating a stash. When I stash changes in a
directory, almost always I intend to only stash real files, not
modified submodules. When I pop the stash later, it gets disrupted due
to submodule conflicts. To avoid getting the conflicts in the first
place, it would be nice to somehow specify:
$ git stash push --no-submodules -- MyDirectory/
Would this make sense?
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: An option to ignore submodules in stash push?
2018-02-06 15:56 An option to ignore submodules in stash push? Robert Dailey
@ 2018-02-06 22:24 ` Stefan Beller
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Beller @ 2018-02-06 22:24 UTC (permalink / raw)
To: Robert Dailey; +Cc: Git
On Tue, Feb 6, 2018 at 7:56 AM, Robert Dailey <rcdailey.lists@gmail.com> wrote:
> I haven't seen such an option, but I think it would be nice to be able
> to ignore submodules when creating a stash. When I stash changes in a
> directory, almost always I intend to only stash real files, not
> modified submodules. When I pop the stash later, it gets disrupted due
> to submodule conflicts. To avoid getting the conflicts in the first
> place, it would be nice to somehow specify:
>
> $ git stash push --no-submodules -- MyDirectory/
>
> Would this make sense?
What kind of submodule conflicts arise?
I remember a recent bugfix with apparent submodules, which
were not touched.
https://public-inbox.org/git/CABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com
https://github.com/git/git/commit/c641ca67072946f95f87e7b21f13f3d4e73701e3
which is included in 2.16.1
But this is me taking a wild guess, can you say more about your use case
and what the actual problem is (and what the expected behavior is, favorably
as a script) ?
Thanks,
Stefan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-06 22:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-06 15:56 An option to ignore submodules in stash push? Robert Dailey
2018-02-06 22:24 ` Stefan Beller
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).