summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-01-02 19:08:40 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-05 10:48:32 -0800
commit2ce53f9b77eb36c6d1286f55fba65f8dc66b2564 (patch)
tree5a297187f15cc12c71515ba8c3a8a8fb8888a1b5 /git-merge-octopus.sh
parent8104ebfe8276657ee803cca7eb8665a78cf3ef83 (diff)
downloadgit-2ce53f9b77eb36c6d1286f55fba65f8dc66b2564.tar.gz
git add: do not add files from a submodule
It comes quite as a surprise to an unsuspecting Git user that calling "git add submodule/file" (which is a mistake, alright) _removes_ the submodule in the index, and adds the file. Instead, complain loudly. While at it, be nice when the user said "git add submodule/" which is most likely the consequence of tab-completion, and stage the submodule, instead of trying to add the contents of that directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions