Revert "multiple -m"
This reverts commit cee12f6a2f
.
This commit broke git-annex init run in a repo that was cloned from a
repo with an adjusted branch checked out.
The problem is that findAdjustingCommit was not able to identify the
commit that created the adjusted branch. It seems that there is an extra
"\n" at the end of the commit message that it does not expect.
Since backwards compatability needs to be maintained, cannot just make
findAdjustingCommit accept it with the "\n". Will have to instead
have one commitTree variant that uses the old method, and use it for
adjusted branch committing.
This commit is contained in:
parent
2b0df3a76d
commit
a8dd85ea5a
15 changed files with 41 additions and 57 deletions
|
@ -34,9 +34,6 @@ files that it does not match will instead be added with `git add`.
|
|||
|
||||
Use this option to specify a commit message.
|
||||
|
||||
If multiple -m options are given, their values are concatenated
|
||||
as separate paragraphs.
|
||||
|
||||
* `--content-of=path` `-C path`
|
||||
|
||||
Only add, pull, and push files in the given path.
|
||||
|
|
|
@ -107,9 +107,6 @@ the tree of files on the remote, even when importing into a subdirectory.
|
|||
Use this option to specify a commit message for the changes that have
|
||||
been made to the special remote since the last import from it.
|
||||
|
||||
If multiple -m options are given, their values are concatenated
|
||||
as separate paragraphs.
|
||||
|
||||
# IMPORTING FROM A DIRECTORY
|
||||
|
||||
When run with a path, `git annex import` **moves** files from somewhere outside
|
||||
|
|
|
@ -51,9 +51,6 @@ when syncing with repositories that have preferred content configured.
|
|||
|
||||
Use this option to specify a commit message.
|
||||
|
||||
If multiple -m options are given, their values are concatenated
|
||||
as separate paragraphs.
|
||||
|
||||
* `--pull`, `--no-pull`
|
||||
|
||||
Use this option to disable pulling.
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
git-annex sync etc -m should be able to be specified multiple times. In git
|
||||
commit, multiple -m can be used to make a multiparagraph commit. --[[Joey]]
|
||||
|
||||
> [[done]]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue