]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/visual-studio'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:22 +0000 (13:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:22 +0000 (13:19 +0900)
Adjust .gitignore to unignore a path that we started to track.

* js/visual-studio:
  .gitignore: stop ignoring `.manifest` files

1  2 
.gitignore

diff --combined .gitignore
index 521d8f4fb421c25e5f733242796fddfa47f39f93,692960406bc676ba7dadd97396dcdbe1404c3313..fc445edea9d3497b72c16629b0729c75d1ebae28
@@@ -58,7 -58,6 +58,7 @@@
  /git-difftool
  /git-difftool--helper
  /git-describe
 +/git-env--helper
  /git-fast-export
  /git-fast-import
  /git-fetch
  *.ipdb
  *.dll
  .vs/
- *.manifest
  Debug/
  Release/
  /UpgradeLog*.htm