[Commits] [wesnoth/wesnoth] 9b1fea: Restructure .gitignore file

GitHub noreply at github.com
Fri Jun 13 14:27:02 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9b1fea031f51cf9e811c02bc8ea3aa5356152d46
      https://github.com/wesnoth/wesnoth/commit/9b1fea031f51cf9e811c02bc8ea3aa5356152d46
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Restructure .gitignore file


  Commit: f30a332963c2758de05837637b13cddebc21e2ec
      https://github.com/wesnoth/wesnoth/commit/f30a332963c2758de05837637b13cddebc21e2ec
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: Restructure existing rules

Organize the rules into groups corresponding to the tools creating
these files.

Use blank lines and comments for clarity.


  Commit: 88d3d76c1234f09ccac0ffbd90832336e798908a
      https://github.com/wesnoth/wesnoth/commit/88d3d76c1234f09ccac0ffbd90832336e798908a
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: Keep README and COPYING files


  Commit: cdd8b932ee6c602db5220753562a0e080f420f37
      https://github.com/wesnoth/wesnoth/commit/cdd8b932ee6c602db5220753562a0e080f420f37
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: Additional cmake rules


  Commit: af9761fa81f2758c7f62368b7c39422ff9c70a3b
      https://github.com/wesnoth/wesnoth/commit/af9761fa81f2758c7f62368b7c39422ff9c70a3b
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore
    R po/.gitignore
    R po/wesnoth-ai/.gitignore
    R po/wesnoth-anl/.gitignore
    R po/wesnoth-aoi/.gitignore
    R po/wesnoth-did/.gitignore
    R po/wesnoth-dw/.gitignore
    R po/wesnoth-editor/.gitignore
    R po/wesnoth-ei/.gitignore
    R po/wesnoth-help/.gitignore
    R po/wesnoth-httt/.gitignore
    R po/wesnoth-l/.gitignore
    R po/wesnoth-lib/.gitignore
    R po/wesnoth-low/.gitignore
    R po/wesnoth-manpages/.gitignore
    R po/wesnoth-manual/.gitignore
    R po/wesnoth-multiplayer/.gitignore
    R po/wesnoth-nr/.gitignore
    R po/wesnoth-sof/.gitignore
    R po/wesnoth-sotbe/.gitignore
    R po/wesnoth-tb/.gitignore
    R po/wesnoth-test/.gitignore
    R po/wesnoth-thot/.gitignore
    R po/wesnoth-trow/.gitignore
    R po/wesnoth-tsg/.gitignore
    R po/wesnoth-tutorial/.gitignore
    R po/wesnoth-units/.gitignore
    R po/wesnoth/.gitignore

  Log Message:
  -----------
  gitignore: Merge rules from po/**/.gitignore files


  Commit: 665a2974458024aa7994467449c9f872f6ced0d0
      https://github.com/wesnoth/wesnoth/commit/665a2974458024aa7994467449c9f872f6ced0d0
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    R po/wesnoth-ai/remove-potcdate.sin
    R po/wesnoth-anl/remove-potcdate.sin
    R po/wesnoth-aoi/remove-potcdate.sin
    R po/wesnoth-did/remove-potcdate.sin
    R po/wesnoth-dm/remove-potcdate.sin
    R po/wesnoth-dw/remove-potcdate.sin
    R po/wesnoth-editor/remove-potcdate.sin
    R po/wesnoth-ei/remove-potcdate.sin
    R po/wesnoth-httt/remove-potcdate.sin
    R po/wesnoth-l/remove-potcdate.sin
    R po/wesnoth-lib/remove-potcdate.sin
    R po/wesnoth-low/remove-potcdate.sin
    R po/wesnoth-multiplayer/remove-potcdate.sin
    R po/wesnoth-nr/remove-potcdate.sin
    R po/wesnoth-sof/remove-potcdate.sin
    R po/wesnoth-sotbe/remove-potcdate.sin
    R po/wesnoth-tb/remove-potcdate.sin
    R po/wesnoth-test/remove-potcdate.sin
    R po/wesnoth-thot/remove-potcdate.sin
    R po/wesnoth-trow/remove-potcdate.sin
    R po/wesnoth-tsg/remove-potcdate.sin
    R po/wesnoth-tutorial/remove-potcdate.sin
    R po/wesnoth-units/remove-potcdate.sin
    R po/wesnoth-utbs/POTFILES.in
    R po/wesnoth-utbs/remove-potcdate.sin
    R po/wesnoth/remove-potcdate.sin

  Log Message:
  -----------
  Remove unnecessary translation scripts

The new gitignore rules will automatically ignore these.


  Commit: 05641062c8bd4b48764a45e5ecbf53e8c99179a5
      https://github.com/wesnoth/wesnoth/commit/05641062c8bd4b48764a45e5ecbf53e8c99179a5
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore
    R data/campaigns/An_Orcish_Incursion/images/.gitignore
    R data/campaigns/Descent_Into_Darkness/images/misc/.gitignore
    R data/campaigns/Descent_Into_Darkness/images/portraits/.gitignore
    R data/campaigns/Descent_Into_Darkness/images/units/.gitignore
    R data/campaigns/Eastern_Invasion/images/portraits/.gitignore
    R data/campaigns/Eastern_Invasion/images/units/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/portraits/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/story/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/units/.gitignore
    R data/campaigns/Liberty/images/.gitignore
    R data/campaigns/Liberty/images/attacks/.gitignore
    R data/campaigns/Liberty/images/halo/.gitignore
    R data/campaigns/Liberty/images/maps/.gitignore
    R data/campaigns/Liberty/images/portraits/.gitignore
    R data/campaigns/Liberty/images/projectiles/.gitignore
    R data/campaigns/Liberty/images/story/.gitignore
    R data/campaigns/Northern_Rebirth/images/.gitignore
    R data/campaigns/Northern_Rebirth/images/portraits/.gitignore
    R data/campaigns/The_South_Guard/images/deoran/.gitignore
    R data/campaigns/The_South_Guard/images/flag/.gitignore
    R data/campaigns/The_South_Guard/images/portraits/.gitignore
    R data/campaigns/The_South_Guard/images/story/.gitignore
    R data/campaigns/The_South_Guard/images/units/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/attacks/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/items/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/misc/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/portraits/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/projectiles/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/terrain/.gitignore
    R data/core/images/.gitignore
    R data/core/images/attacks/.gitignore
    R data/core/images/halo/.gitignore
    R data/core/images/halo/elven/.gitignore
    R data/core/images/halo/holy/.gitignore
    R data/core/images/halo/undead/.gitignore
    R data/core/images/help/.gitignore
    R data/core/images/items/.gitignore
    R data/core/images/maps/.gitignore
    R data/core/images/misc/.gitignore
    R data/core/images/projectiles/.gitignore
    R data/core/images/scenery/.gitignore
    R data/core/images/terrain/castle/.gitignore
    R data/core/images/terrain/castle/elven/.gitignore
    R data/core/images/terrain/cave/.gitignore
    R data/core/images/terrain/flat/.gitignore
    R data/core/images/terrain/forest/.gitignore
    R data/core/images/terrain/off-map/.gitignore
    R data/core/images/terrain/swamp/.gitignore
    R data/core/images/terrain/village/.gitignore
    R data/core/images/terrain/water/.gitignore
    R data/core/images/themes/.gitignore
    R data/core/images/units/.gitignore
    R data/core/images/units/drakes/.gitignore
    R data/core/images/units/dwarves/.gitignore
    R data/core/images/units/elves-wood/.gitignore
    R data/core/images/units/goblins/.gitignore
    R data/core/images/units/human-loyalists/.gitignore
    R data/core/images/units/human-magi/.gitignore
    R data/core/images/units/human-outlaws/.gitignore
    R data/core/images/units/human-peasants/.gitignore
    R data/core/images/units/merfolk/.gitignore
    R data/core/images/units/monsters/.gitignore
    R data/core/images/units/nagas/.gitignore
    R data/core/images/units/ogres/.gitignore
    R data/core/images/units/orcs/.gitignore
    R data/core/images/units/saurians/.gitignore
    R data/core/images/units/transport/.gitignore
    R data/core/images/units/trolls/.gitignore
    R data/core/images/units/undead-necromancers/.gitignore
    R data/core/images/units/undead-skeletal/.gitignore
    R data/core/images/units/undead/.gitignore
    R data/core/images/units/woses/.gitignore
    R icons/.gitignore
    R images/cursors-bw/.gitignore
    R images/cursors/.gitignore
    R images/dialogs/.gitignore
    R images/footsteps/.gitignore
    R images/icons/.gitignore
    R images/tools/.gitignore
    R images/tools/exploder/.gitignore

  Log Message:
  -----------
  gitignore: Merge dozens of "Thumbs.db" rules

It suffices to apply the rule once in the root directory.


  Commit: 0abdaf7a96a9c92c95a446b08ee88a8679130578
      https://github.com/wesnoth/wesnoth/commit/0abdaf7a96a9c92c95a446b08ee88a8679130578
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: Reduce number of false positives

Especially in utils/umc_dev/ a massive number of files matched ignore
rules. As tracked files can't be ignored, this had no real consequences.


  Commit: 15503ff27e46b02622ebfc2cca7ffa1f6f0030b5
      https://github.com/wesnoth/wesnoth/commit/15503ff27e46b02622ebfc2cca7ffa1f6f0030b5
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: Fix order of rules for Makefiles

The exceptions were applied before the generic rule, thus they had
no effect.


  Commit: 5db587182d5714eb5ce47aca002f6647823d70f2
      https://github.com/wesnoth/wesnoth/commit/5db587182d5714eb5ce47aca002f6647823d70f2
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: Block some extensions


  Commit: 1e9a50879552aff8f77fddb4f89b852404788928
      https://github.com/wesnoth/wesnoth/commit/1e9a50879552aff8f77fddb4f89b852404788928
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore
    R projectfiles/CodeBlocks-SCons/.gitignore
    R projectfiles/CodeBlocks/.gitignore
    R projectfiles/CodeLite/.gitignore
    R projectfiles/VC9/.gitignore
    R projectfiles/Xcode/.gitignore
    R projectfiles/Xcode/Wesnoth.xcodeproj/.gitignore

  Log Message:
  -----------
  gitignore: Merge rules from projectfiles/


  Commit: 1715ab314591a7c0206d4f8afbb019eef80584c9
      https://github.com/wesnoth/wesnoth/commit/1715ab314591a7c0206d4f8afbb019eef80584c9
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore
    R data/lua/.gitignore
    R scons/.gitignore
    R utils/.gitignore

  Log Message:
  -----------
  gitignore: Include more rules from subdirectories

That is: data/lua/, scons/, and utils/


  Commit: c19e729c6b5904f3385f9e6b9bef137bfc265dfa
      https://github.com/wesnoth/wesnoth/commit/c19e729c6b5904f3385f9e6b9bef137bfc265dfa
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M .gitignore
    R data/tools/.gitignore
    R data/tools/unit_tree/.gitignore
    R data/tools/wesnoth/.gitignore
    R doc/.gitignore
    R doc/design/.gitignore
    R doc/doxygen/.gitignore
    R doc/man/.gitignore
    R doc/manual/.gitignore
    R doc/manual/images/.gitignore

  Log Message:
  -----------
  gitignore: Merge rules from doc/ and data/tools


  Commit: ca1e632b627c55519889756f5e417b4919f03f3f
      https://github.com/wesnoth/wesnoth/commit/ca1e632b627c55519889756f5e417b4919f03f3f
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M utils/wescamp_import

  Log Message:
  -----------
  Remove remove-potcdate.sin from wescamp-import

If we delete the remove-potcdate.sin scripts, we may as well remove the paragraph importing them.


  Commit: 07a6ba695e673051f16191074fc5e187509cb787
      https://github.com/wesnoth/wesnoth/commit/07a6ba695e673051f16191074fc5e187509cb787
  Author: Alexander van Gessel <AI0867 at gmail.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M .gitignore
    R data/campaigns/An_Orcish_Incursion/images/.gitignore
    R data/campaigns/Descent_Into_Darkness/images/misc/.gitignore
    R data/campaigns/Descent_Into_Darkness/images/portraits/.gitignore
    R data/campaigns/Descent_Into_Darkness/images/units/.gitignore
    R data/campaigns/Eastern_Invasion/images/portraits/.gitignore
    R data/campaigns/Eastern_Invasion/images/units/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/portraits/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/story/.gitignore
    R data/campaigns/Heir_To_The_Throne/images/units/.gitignore
    R data/campaigns/Liberty/images/.gitignore
    R data/campaigns/Liberty/images/attacks/.gitignore
    R data/campaigns/Liberty/images/halo/.gitignore
    R data/campaigns/Liberty/images/maps/.gitignore
    R data/campaigns/Liberty/images/portraits/.gitignore
    R data/campaigns/Liberty/images/projectiles/.gitignore
    R data/campaigns/Liberty/images/story/.gitignore
    R data/campaigns/Northern_Rebirth/images/.gitignore
    R data/campaigns/Northern_Rebirth/images/portraits/.gitignore
    R data/campaigns/The_South_Guard/images/deoran/.gitignore
    R data/campaigns/The_South_Guard/images/flag/.gitignore
    R data/campaigns/The_South_Guard/images/portraits/.gitignore
    R data/campaigns/The_South_Guard/images/story/.gitignore
    R data/campaigns/The_South_Guard/images/units/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/attacks/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/items/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/misc/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/portraits/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/projectiles/.gitignore
    R data/campaigns/Under_the_Burning_Suns/images/terrain/.gitignore
    R data/core/images/.gitignore
    R data/core/images/attacks/.gitignore
    R data/core/images/halo/.gitignore
    R data/core/images/halo/elven/.gitignore
    R data/core/images/halo/holy/.gitignore
    R data/core/images/halo/undead/.gitignore
    R data/core/images/help/.gitignore
    R data/core/images/items/.gitignore
    R data/core/images/maps/.gitignore
    R data/core/images/misc/.gitignore
    R data/core/images/projectiles/.gitignore
    R data/core/images/scenery/.gitignore
    R data/core/images/terrain/castle/.gitignore
    R data/core/images/terrain/castle/elven/.gitignore
    R data/core/images/terrain/cave/.gitignore
    R data/core/images/terrain/flat/.gitignore
    R data/core/images/terrain/forest/.gitignore
    R data/core/images/terrain/off-map/.gitignore
    R data/core/images/terrain/swamp/.gitignore
    R data/core/images/terrain/village/.gitignore
    R data/core/images/terrain/water/.gitignore
    R data/core/images/themes/.gitignore
    R data/core/images/units/.gitignore
    R data/core/images/units/drakes/.gitignore
    R data/core/images/units/dwarves/.gitignore
    R data/core/images/units/elves-wood/.gitignore
    R data/core/images/units/goblins/.gitignore
    R data/core/images/units/human-loyalists/.gitignore
    R data/core/images/units/human-magi/.gitignore
    R data/core/images/units/human-outlaws/.gitignore
    R data/core/images/units/human-peasants/.gitignore
    R data/core/images/units/merfolk/.gitignore
    R data/core/images/units/monsters/.gitignore
    R data/core/images/units/nagas/.gitignore
    R data/core/images/units/ogres/.gitignore
    R data/core/images/units/orcs/.gitignore
    R data/core/images/units/saurians/.gitignore
    R data/core/images/units/transport/.gitignore
    R data/core/images/units/trolls/.gitignore
    R data/core/images/units/undead-necromancers/.gitignore
    R data/core/images/units/undead-skeletal/.gitignore
    R data/core/images/units/undead/.gitignore
    R data/core/images/units/woses/.gitignore
    R data/lua/.gitignore
    R data/tools/.gitignore
    R data/tools/unit_tree/.gitignore
    R data/tools/wesnoth/.gitignore
    R doc/.gitignore
    R doc/design/.gitignore
    R doc/doxygen/.gitignore
    R doc/man/.gitignore
    R doc/manual/.gitignore
    R doc/manual/images/.gitignore
    R icons/.gitignore
    R images/cursors-bw/.gitignore
    R images/cursors/.gitignore
    R images/dialogs/.gitignore
    R images/footsteps/.gitignore
    R images/icons/.gitignore
    R images/tools/.gitignore
    R images/tools/exploder/.gitignore
    R po/.gitignore
    R po/wesnoth-ai/.gitignore
    R po/wesnoth-ai/remove-potcdate.sin
    R po/wesnoth-anl/.gitignore
    R po/wesnoth-anl/remove-potcdate.sin
    R po/wesnoth-aoi/.gitignore
    R po/wesnoth-aoi/remove-potcdate.sin
    R po/wesnoth-did/.gitignore
    R po/wesnoth-did/remove-potcdate.sin
    R po/wesnoth-dm/remove-potcdate.sin
    R po/wesnoth-dw/.gitignore
    R po/wesnoth-dw/remove-potcdate.sin
    R po/wesnoth-editor/.gitignore
    R po/wesnoth-editor/remove-potcdate.sin
    R po/wesnoth-ei/.gitignore
    R po/wesnoth-ei/remove-potcdate.sin
    R po/wesnoth-help/.gitignore
    R po/wesnoth-httt/.gitignore
    R po/wesnoth-httt/remove-potcdate.sin
    R po/wesnoth-l/.gitignore
    R po/wesnoth-l/remove-potcdate.sin
    R po/wesnoth-lib/.gitignore
    R po/wesnoth-lib/remove-potcdate.sin
    R po/wesnoth-low/.gitignore
    R po/wesnoth-low/remove-potcdate.sin
    R po/wesnoth-manpages/.gitignore
    R po/wesnoth-manual/.gitignore
    R po/wesnoth-multiplayer/.gitignore
    R po/wesnoth-multiplayer/remove-potcdate.sin
    R po/wesnoth-nr/.gitignore
    R po/wesnoth-nr/remove-potcdate.sin
    R po/wesnoth-sof/.gitignore
    R po/wesnoth-sof/remove-potcdate.sin
    R po/wesnoth-sotbe/.gitignore
    R po/wesnoth-sotbe/remove-potcdate.sin
    R po/wesnoth-tb/.gitignore
    R po/wesnoth-tb/remove-potcdate.sin
    R po/wesnoth-test/.gitignore
    R po/wesnoth-test/remove-potcdate.sin
    R po/wesnoth-thot/.gitignore
    R po/wesnoth-thot/remove-potcdate.sin
    R po/wesnoth-trow/.gitignore
    R po/wesnoth-trow/remove-potcdate.sin
    R po/wesnoth-tsg/.gitignore
    R po/wesnoth-tsg/remove-potcdate.sin
    R po/wesnoth-tutorial/.gitignore
    R po/wesnoth-tutorial/remove-potcdate.sin
    R po/wesnoth-units/.gitignore
    R po/wesnoth-units/remove-potcdate.sin
    R po/wesnoth-utbs/POTFILES.in
    R po/wesnoth-utbs/remove-potcdate.sin
    R po/wesnoth/.gitignore
    R po/wesnoth/remove-potcdate.sin
    R projectfiles/CodeBlocks-SCons/.gitignore
    R projectfiles/CodeBlocks/.gitignore
    R projectfiles/CodeLite/.gitignore
    R projectfiles/VC9/.gitignore
    R projectfiles/Xcode/.gitignore
    R projectfiles/Xcode/Wesnoth.xcodeproj/.gitignore
    R scons/.gitignore
    R utils/.gitignore
    M utils/wescamp_import

  Log Message:
  -----------
  Merge pull request #199 from aquileia/ignore

Restructure and merge .gitignore files


Compare: https://github.com/wesnoth/wesnoth/compare/fa5fce419cb4...07a6ba695e67


More information about the Commits mailing list