Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
remote-hg: fix order of configuration comments
author
Felipe Contreras
<felipe.contreras@gmail.com>
Tue, 21 May 2013 03:47:53 +0000
(22:47 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 21 May 2013 16:33:24 +0000
(09:33 -0700)
The other configurations were added in the wrong place.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/remote-helpers/git-remote-hg
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
92c4369
)
diff --git
a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 57a4c0af5078f10e2876850e3a70dbf8af2a126b..1dd3d7030efa7e6a3e25a45d019938e2d8f8d890 100755
(executable)
--- a/
contrib/remote-helpers/git-remote-hg
+++ b/
contrib/remote-helpers/git-remote-hg
@@
-24,9
+24,6
@@
import urllib
import atexit
import urlparse, hashlib
import atexit
import urlparse, hashlib
-#
-# If you want to switch to hg-git compatibility mode:
-# git config --global remote-hg.hg-git-compat true
#
# If you are not in hg-git-compat mode and want to disable the tracking of
# named branches:
#
# If you are not in hg-git-compat mode and want to disable the tracking of
# named branches:
@@
-38,6
+35,9
@@
import urlparse, hashlib
# If you want the equivalent of hg's clone/pull--insecure option:
# git config --global remote-hg.insecure true
#
# If you want the equivalent of hg's clone/pull--insecure option:
# git config --global remote-hg.insecure true
#
+# If you want to switch to hg-git compatibility mode:
+# git config --global remote-hg.hg-git-compat true
+#
# git:
# Sensible defaults for git.
# hg bookmarks are exported as git branches, hg branches are prefixed
# git:
# Sensible defaults for git.
# hg bookmarks are exported as git branches, hg branches are prefixed