]> git.ipfire.org Git - thirdparty/git.git/commit - git-stash.sh
Ignore dirty submodule states during rebase and stash
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 14 May 2008 17:03:59 +0000 (18:03 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 May 2008 23:12:43 +0000 (16:12 -0700)
commit6848d58c60b7af365ce54cf3e3b274a2f9da2e7e
tree381f5f3f7a3bce86560329e9ad2290cc71e758e6
parent5fdeacb0ca3935923ab988c81414c16080db6a32
Ignore dirty submodule states during rebase and stash

When rebasing or stashing, chances are that you do not care about
dirty submodules, since they are not updated by those actions anyway.
So ignore the submodules' states.

Note: the submodule states -- as committed in the superproject --
will still be stashed and rebased, it is _just_ the state of the
submodule in the working tree which is ignored.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh
git-rebase.sh
git-stash.sh
t/t7402-submodule-rebase.sh [new file with mode: 0755]