diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
| commit | 03754659d6381ac95d4d5e8dc612d3ad6865b581 (patch) | |
| tree | 0e7339c5937c5d6e3ce44538ddeb83d1e9cfdcfb /etckeeper.conf | |
| parent | 3482cc3995b86f0f053a7e010f82451de292a266 (diff) | |
| parent | a3f643fc9d8fc4b45c1bed3cfa8415afb9eb3873 (diff) | |
Merge branch 'master' of git://git.kitenet.net/etckeeper into bzrplugin
Conflicts:
debian/changelog
Diffstat (limited to 'etckeeper.conf')
| -rw-r--r-- | etckeeper.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/etckeeper.conf b/etckeeper.conf index f7a7ddf..f1438ab 100644 --- a/etckeeper.conf +++ b/etckeeper.conf @@ -12,6 +12,11 @@ VCS="git" # Options passed to bzr commit when run by etckeeper. #BZR_COMMIT_OPTIONS="" +# Uncomment to avoid etckeeper committing existing changes to +# /etc before installation. It will cancel the installation, +# so you can commit the changes by hand. +#AVOID_COMMIT_BEFORE_INSTALL=1 + # The high-level package manager that's being used. HIGHLEVEL_PACKAGE_MANAGER=apt |