[Box Backup-commit] [boxbackup/boxbackup] 91b101: Stop Git from normalising line endings

GitHub noreply at github.com
Fri Jul 7 22:26:42 BST 2017


  Branch: refs/heads/s3_support
  Home:   https://github.com/boxbackup/boxbackup
  Commit: 91b101c8a2f4fb43e0cbfbb55d126e8f675dffd5
      https://github.com/boxbackup/boxbackup/commit/91b101c8a2f4fb43e0cbfbb55d126e8f675dffd5
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  Stop Git from normalising line endings

Although recommended, "text" mode causes constant and unfixable conficts
that I give up fighting with.

(cherry picked from commit 25e445a6848a870aabd89a3b8a013265aa3cf17b)


  Commit: da14fc68ff6829f31ebb5a0542b41f3adf6c2897
      https://github.com/boxbackup/boxbackup/commit/da14fc68ff6829f31ebb5a0542b41f3adf6c2897
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M infrastructure/buildenv-testmain-template.cpp

  Log Message:
  -----------
  Remove duplicate code added by incorrect merge


  Commit: 3f840db1ba6d04fc15e9a988d0c460884dce4384
      https://github.com/boxbackup/boxbackup/commit/3f840db1ba6d04fc15e9a988d0c460884dce4384
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  Update appveyor.yml to match s3_support_merge branch


  Commit: 71b061ca59879d0e8b5f1b4fd3ca148ae6b274e3
      https://github.com/boxbackup/boxbackup/commit/71b061ca59879d0e8b5f1b4fd3ca148ae6b274e3
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M bin/bbstoreaccounts/bbstoreaccounts.cpp

  Log Message:
  -----------
  Whitespace cleanup


  Commit: 4b026ff95c3f893d300d2fa847a3c73f67e0740a
      https://github.com/boxbackup/boxbackup/commit/4b026ff95c3f893d300d2fa847a3c73f67e0740a
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    R circle.yml

  Log Message:
  -----------
  Remove unused circle.yml


  Commit: 23a8f1f31577ec45438a9689f732534459776b1e
      https://github.com/boxbackup/boxbackup/commit/23a8f1f31577ec45438a9689f732534459776b1e
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M infrastructure/cmake/CMakeLists.txt

  Log Message:
  -----------
  Add support for RelWithDebInfo builds using CMake

Debugging release tests is pretty difficult without debug info. This
release-compatible build makes it easier.

(cherry picked from commit 1e3cc0d7e08bac465d018cdfa6df2c668d170885)


Compare: https://github.com/boxbackup/boxbackup/compare/4ad5f2b9c368...23a8f1f31577


More information about the Boxbackup-commit mailing list