git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-02 17:14:01 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'some-CR-fixes'

Browse Source 
This branch contains some hacks so that Git produces less CR, and then
some tests.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Stepan Kasal
2014-05-29 11:09:24 +02:00
parent 8746a0e5f3 b1d0764958
commit 5fc80b71bb
8 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-submodule.sh
View File

@@ -434,9 +434,11 @@ cmd_add()
if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
then
eval_gettextln "The following path is ignored by one of your .gitignore files:
\$sm_path
Use -f if you really want to add it." >&2
cat >&2 <<EOF
The following path is ignored by one of your .gitignore files:
$(eval_gettextln $sm_path)
Use -f if you really want to add it.
EOF
exit 1
fi