summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-15 14:15:03 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-15 14:15:03 -0700
commit5b948855b926d801faad7808d010bbb9c1dc1f26 (patch)
tree5550c4296a5b3fc54b4dd98d743be74e28665c87
parent02a2850ad58eff6de70eb2dc5f96345c463857ac (diff)
parentda446109ff75120a9836d21653e12154e58f8c46 (diff)
downloadgit-5b948855b926d801faad7808d010bbb9c1dc1f26.tar.gz
Merge branch 'svn-doc' of git://bogomips.org/git-svn
* 'svn-doc' of git://bogomips.org/git-svn: git-svn: document special options for commit-diff
-rw-r--r--Documentation/git-svn.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index fba0b4eece..aa2aeabb60 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -459,6 +459,21 @@ Any other arguments are passed directly to 'git log'
(URL) may be omitted if you are working from a 'git svn'-aware
repository (that has been `init`-ed with 'git svn').
The -r<revision> option is required for this.
++
+The commit message is supplied either directly with the `-m` or `-F`
+option, or indirectly from the tag or commit when the second tree-ish
+denotes such an object, or it is requested by invoking an editor (see
+`--edit` option below).
+
+-m <msg>;;
+--message=<msg>;;
+ Use the given `msg` as the commit message. This option
+ disables the `--edit` option.
+
+-F <filename>;;
+--file=<filename>;;
+ Take the commit message from the given file. This option
+ disables the `--edit` option.
'info'::
Shows information about a file or directory similar to what