diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-13 18:36:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-13 18:36:17 -0400 |
| commit | 3e0c966e1da392b5c9ecdbb0e0a115088a784b15 (patch) | |
| tree | 2262951b1f82d792f8942bdaac4cc505c2cff8d4 /doc/git-annex.mdwn | |
| parent | e8c8e506d696173512dd134766c9d7fc8ea63c32 (diff) | |
devblog
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 74ce72137..b8ad6a1d6 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -174,6 +174,8 @@ subdirectories). This behavior can be overridden by configuring the preferred content of a repository. See see PREFERRED CONTENT below. + The `--message` or `-m` option can be used to specify a commit message. + * `merge` This performs the same merging (and merge conflict resolution) |