diff --git a/src/pycalver/__main__.py b/src/pycalver/__main__.py
index 2f03c13..609be62 100644
--- a/src/pycalver/__main__.py
+++ b/src/pycalver/__main__.py
@@ -31,8 +31,6 @@ log = logging.getLogger("pycalver.cli")
 
 
 def _init_loggers(verbose: int = 0) -> None:
-    verbose = max(_VERBOSE, verbose)
-
     if verbose >= 2:
         log_format = "%(asctime)s.%(msecs)03d %(levelname)-7s %(name)-15s - %(message)s"
         log_level  = logging.DEBUG
@@ -85,6 +83,7 @@ def _update_cfg_from_vcs(cfg: config.Config, fetch: bool) -> config.Config:
 @click.option('-f', "--fetch/--no-fetch", is_flag=True, default=True)
 def show(verbose: int = 0, fetch: bool = True) -> None:
     """Show current version."""
+    verbose = max(_VERBOSE, verbose)
     _init_loggers(verbose=verbose)
 
     cfg: config.MaybeConfig = config.parse()
@@ -106,6 +105,7 @@ def show(verbose: int = 0, fetch: bool = True) -> None:
 )
 def incr(old_version: str, verbose: int = 0, release: str = None) -> None:
     """Increment a version number for demo purposes."""
+    verbose = max(_VERBOSE, verbose)
     _init_loggers(verbose)
 
     if release and release not in parse.VALID_RELESE_VALUES:
@@ -127,6 +127,7 @@ def incr(old_version: str, verbose: int = 0, release: str = None) -> None:
 )
 def init(verbose: int = 0, dry: bool = False) -> None:
     """Initialize [pycalver] configuration."""
+    verbose = max(_VERBOSE, verbose)
     _init_loggers(verbose)
 
     cfg   : config.MaybeConfig = config.parse()
@@ -200,6 +201,7 @@ def bump(
     fetch      : bool = True,
 ) -> None:
     """Increment the current version string and update project files."""
+    verbose = max(_VERBOSE, verbose)
     _init_loggers(verbose)
 
     if release and release not in parse.VALID_RELESE_VALUES:
@@ -227,19 +229,23 @@ def bump(
     file_patterns = cfg.file_patterns
     filepaths     = set(file_patterns.keys())
 
-    rewrite.rewrite(new_version, file_patterns, dry, verbose)
+    _vcs: typ.Optional[vcs.VCS]
 
     try:
         _vcs = vcs.get_vcs()
     except OSError:
         log.warn("Version Control System not found, aborting commit.")
+        _vcs = None
+
+    # if _vcs:
+    #     _assert_not_dirty(_vcs, filepaths, allow_dirty)
+
+    rewrite.rewrite(new_version, file_patterns, dry=dry, verbose=verbose)
+
+    if dry or _vcs is None or not cfg.commit:
         return
 
-    _assert_not_dirty(_vcs, filepaths, allow_dirty)
-
-    if dry or not cfg.commit:
-        return
-
+    return
     for filepath in filepaths:
         _vcs.add(filepath)
 
diff --git a/src/pycalver/rewrite.py b/src/pycalver/rewrite.py
index 93f2bcb..d531784 100644
--- a/src/pycalver/rewrite.py
+++ b/src/pycalver/rewrite.py
@@ -14,6 +14,15 @@ from . import parse
 log = logging.getLogger("pycalver.rewrite")
 
 
+def _detect_line_sep(content: str) -> str:
+    if "\r\n" in content:
+        return "\r\n"
+    elif "\r" in content:
+        return "\r"
+    else:
+        return "\n"
+
+
 def rewrite_lines(
     old_lines: typ.List[str], patterns: typ.List[str], new_version: str
 ) -> typ.List[str]:
@@ -34,16 +43,14 @@ def rewrite_lines(
 
 
 def rewrite(
-    new_version: str, file_patterns: typ.Dict[str, typ.List[str]], dry=False, verbose=False
+    new_version: str, file_patterns: typ.Dict[str, typ.List[str]], dry=False, verbose: int = 0
 ) -> None:
     for filepath, patterns in file_patterns.items():
         with io.open(filepath, mode="rt", encoding="utf-8") as fh:
             content = fh.read()
 
-        # TODO (mb 2018-09-18): Detect line sep
-        line_sep = "\n"
-
-        old_lines = content.splitlines()
+        line_sep  = _detect_line_sep(content)
+        old_lines = content.split(line_sep)
         new_lines = rewrite_lines(old_lines, patterns, new_version)
 
         if dry or verbose: