threads / patch / 33885

patch, 2 partsremote-hg: fix configuration notes

Subject: [PATCH 0/2] remote-hg: fix configuration notes

## tl;dr

4 messages between May 21, 2013 and May 21, 2013. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Felipe Contreras· May 21, 2013, 03:47 UTC · lore
Hi,
For 'master'.
Felipe Contreras (2):
  remote-hg: trivial configuration note cleanup
  remote-hg: fix order of configuration comments
 contrib/remote-helpers/git-remote-hg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
-- 
1.8.3.rc3.1.gf11a2b7.dirty
Felipe Contreras· May 21, 2013, 03:47 UTC · re: Felipe Contreras · lore

[PATCH 1/2] remote-hg: trivial configuration note cleanup

Follow the style of the previous configurations.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/git-remote-hg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to contrib/remote-helpers/git-remote-hg +1 −1
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index beb864b..88db7c4 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -36,7 +36,7 @@ import urlparse, hashlib
 # git config --global remote-hg.force-push false
 #
 # If you want the equivalent of hg's clone/pull--insecure option:
-# git config remote-hg.insecure true
+# git config --global remote-hg.insecure true
 #
 # git:
 # Sensible defaults for git.

-- 
1.8.3.rc3.1.gf11a2b7.dirty
Felipe Contreras· May 21, 2013, 03:47 UTC · re: Felipe Contreras · lore

[PATCH 2/2] remote-hg: fix order of configuration comments

The other configurations were added in the wrong place.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/git-remote-hg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Show changes to contrib/remote-helpers/git-remote-hg +3 −3
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 88db7c4..198b962 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -25,9 +25,6 @@ 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:
 # git config --global remote-hg.track-branches false
@@ -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 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

-- 
1.8.3.rc3.1.gf11a2b7.dirty

← back to recent threads