Merge branch 'master' into difflines_mode

Author: jugglerchris

.gitignore

@@ -17,3 +17,7 @@
 
 # Used by macOS' file system to track custom attributes of containing folder
 .DS_Store
+
+# Editors' specific files
+.idea/
+.vscode/

CHANGELOG.md

@@ -1,5 +1,69 @@
 # Changelog
 
+## [0.2.15] 2017-11-08
+
+### Added
+
+- Add git-fmt tool
+- `where_single_line` configuration option.
+
+### Changed
+
+- Rename `chain_one_line_max` to `chain_width`.
+- Change the suffix of indent-related configuration options to `_indent`.
+
+## [0.2.14] 2017-11-06
+
+### Fixed
+
+- Rustup to the latest nightly.
+
+## [0.2.13] 2017-10-30
+
+### Fixed
+
+- Rustup to the latest nightly.
+
+## [0.2.12] 2017-10-29
+
+### Fixed
+
+- Fix a bug that `cargo fmt` hangs forever.
+
+## [0.2.11] 2017-10-29
+
+### Fixed
+
+- Fix a bug that `cargo fmt` crashes.
+
+## [0.2.10] 2017-10-28
+
+## [0.2.9] 2017-10-16
+
+## [0.2.8] 2017-09-28
+
+## [0.2.7] 2017-09-21
+
+### Added
+
+- `binop_separator` configuration option (#1964).
+
+### Changed
+
+- Use horizontal layout for function call with a single argument.
+
+### Fixed
+
+- Fix panicking when calling `cargo fmt --all` (#1963).
+- Refactorings & faster rustfmt.
+
+## [0.2.6] 2017-09-14
+
+### Fixed
+
+- Fix a performance issue with nested block (#1940).
+- Refactorings & faster rustfmt.
+
 ## [0.2.5] 2017-08-31
 
 ### Added
@@ -10,13 +74,13 @@
 
 - Use getters to access `Span` fields (#1899).
 
-## [0.2.4] 2018-08-30
+## [0.2.4] 2017-08-30
 
 ### Added
 
 - Add support for `Yield` (#1928).
 
-## [0.2.3] 2018-08-30
+## [0.2.3] 2017-08-30
 
 ### Added
 

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustfmt-nightly"
-version = "0.2.13"
+version = "0.2.15"
 authors = ["Nicholas Cameron <[email protected]>", "The Rustfmt developers"]
 description = "Tool to find and fix Rust formatting issues"
 repository = "https://github.com/rust-lang-nursery/rustfmt"
@@ -22,6 +22,9 @@ name = "cargo-fmt"
 [[bin]]
 name = "rustfmt-format-diff"
 
+[[bin]]
+name = "git-fmt"
+
 [features]
 default = ["cargo-fmt", "rustfmt-format-diff"]
 cargo-fmt = []
@@ -40,6 +43,7 @@ diff = "0.1"
 log = "0.3"
 env_logger = "0.4"
 getopts = "0.2"
+derive-new = "0.5"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.11"