From cf593cc41828c6fc0a2cec50ddac0713ea8a07ec Mon Sep 17 00:00:00 2001 From: James Bowes Date: Sat, 5 May 2007 14:23:12 -0400 Subject: Documentation: fix typo in git-remote.txt Signed-off-by: James Bowes Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index a9fb6a9a5e..3dde7134a5 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -40,7 +40,7 @@ With `-t ` option, instead of the default glob refspec for the remote to track all branches under `$GIT_DIR/remotes//`, a refspec to track only `` is created. You can give more than one `-t ` to track -multiple branche without grabbing all branches. +multiple branches without grabbing all branches. + With `-m ` option, `$GIT_DIR/remotes//HEAD` is set up to point at remote's `` branch instead of whatever -- cgit v1.2.3 From a6080a0a44d5ead84db3dabbbc80e82df838533d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 7 Jun 2007 00:04:01 -0700 Subject: War on whitespace This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 3dde7134a5..ab232c2f68 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -128,4 +128,3 @@ Documentation by J. Bruce Fields and the git-list . GIT --- Part of the gitlink:git[7] suite - -- cgit v1.2.3 From 181ea688b83d3b46b9d0e55f1db0123332611db6 Mon Sep 17 00:00:00 2001 From: Sam Vilain Date: Sat, 30 Jun 2007 20:56:16 +1200 Subject: git-remote: document -n The 'show' and 'prune' commands accept an option '-n'; document what it does. Signed-off-by: Sam Vilain Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 3dde7134a5..b35c65ba3b 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -49,6 +49,9 @@ branch the `HEAD` at the remote repository actually points at. 'show':: Gives some information about the remote . ++ +With `-n` option, the remote heads are not queried first with +`git ls-remote `; cached information is used instead. 'prune':: @@ -56,6 +59,10 @@ Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in "remotes/". ++ +With `-n` option, the remote heads are not confirmed first with `git +ls-remote `; cached information is used instead. Use with +caution. 'update':: -- cgit v1.2.3 From 38944390220425cc3c4208dd31172397e7f18e8c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 2 Sep 2007 21:10:14 +0100 Subject: Teach "git remote" a mirror mode When using the "--mirror" option to "git remote add", the refs will not be stored in the refs/remotes/ namespace, but in the same location as on the remote side. This option probably only makes sense in a bare repository. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 61a6022ce8..94b9f17772 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git-remote' -'git-remote' add [-t ] [-m ] [-f] +'git-remote' add [-t ] [-m ] [-f] [--mirror] 'git-remote' show 'git-remote' prune 'git-remote' update [group] @@ -45,6 +45,10 @@ multiple branches without grabbing all branches. With `-m ` option, `$GIT_DIR/remotes//HEAD` is set up to point at remote's `` branch instead of whatever branch the `HEAD` at the remote repository actually points at. ++ +In mirror mode, enabled with `--mirror`, the refs will not be stored +in the 'refs/remotes/' namespace, but in 'refs/heads/'. This option +only makes sense in bare repositories. 'show':: -- cgit v1.2.3 From 1b4cbb5d5880091b1f4980e7a3f5cac276352bee Mon Sep 17 00:00:00 2001 From: James Bowes Date: Sat, 7 Jul 2007 11:22:43 -0400 Subject: remote: document the 'rm' subcommand Signed-off-by: James Bowes Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 94b9f17772..027ba11bdb 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -11,6 +11,7 @@ SYNOPSIS [verse] 'git-remote' 'git-remote' add [-t ] [-m ] [-f] [--mirror] +'git-remote' rm 'git-remote' show 'git-remote' prune 'git-remote' update [group] @@ -50,6 +51,11 @@ In mirror mode, enabled with `--mirror`, the refs will not be stored in the 'refs/remotes/' namespace, but in 'refs/heads/'. This option only makes sense in bare repositories. +'rm':: + +Remove the remote named . All remote tracking branches and +configuration settings for the remote are removed. + 'show':: Gives some information about the remote . -- cgit v1.2.3 From cb5c49b9afb5551659c6819aefaa8e4de26a4366 Mon Sep 17 00:00:00 2001 From: Sergei Organov Date: Tue, 13 Nov 2007 21:17:47 +0300 Subject: git-remote.txt: fix typo Signed-off-by: Sergei Organov Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 61a6022ce8..c386dd0168 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -69,7 +69,7 @@ caution. Fetch updates for a named set of remotes in the repository as defined by remotes.. If a named group is not specified on the command line, the configuration parameter remotes.default will get used; if -remotes.default is not defined, all remotes which do not the +remotes.default is not defined, all remotes which do not have the configuration parameter remote..skipDefaultUpdate set to true will be updated. (See gitlink:git-config[1]). -- cgit v1.2.3 From 8391c60b6e08604e7023a8fff74350d6b35974af Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 2 Nov 2007 22:54:31 -0400 Subject: git-remote.txt: fix example url If I'm going to use a real example as a URL, I suppose I should get it right.... Signed-off-by: J. Bruce Fields --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index c386dd0168..886bc03c4a 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -91,7 +91,7 @@ $ git remote origin $ git branch -r origin/master -$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git +$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git $ git remote linux-nfs origin -- cgit v1.2.3 From 5162e69732d13dd079919a389a6ace8878aad716 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 29 Dec 2007 00:20:38 -0600 Subject: Documentation: rename gitlink macro to linkgit Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P\w(\w|-)*?):(?P\S*?)(\[(?P.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P(http|https|ftp|file|mailto|callto|image|link)):(?P\S*?)(\[(?P.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 4b263c249c..10f6fa58bf 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -81,7 +81,7 @@ remotes.. If a named group is not specified on the command line, the configuration parameter remotes.default will get used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote..skipDefaultUpdate set to true will -be updated. (See gitlink:git-config[1]). +be updated. (See linkgit:git-config[1]). DISCUSSION @@ -89,7 +89,7 @@ DISCUSSION The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See -gitlink:git-config[1]). +linkgit:git-config[1]). Examples -------- @@ -128,9 +128,9 @@ $ git merge origin See Also -------- -gitlink:git-fetch[1] -gitlink:git-branch[1] -gitlink:git-config[1] +linkgit:git-fetch[1] +linkgit:git-branch[1] +linkgit:git-config[1] Author ------ @@ -144,4 +144,4 @@ Documentation by J. Bruce Fields and the git-list . GIT --- -Part of the gitlink:git[7] suite +Part of the linkgit:git[7] suite -- cgit v1.2.3 From 5ea55edb68f488fad76c007472830cc649e3d320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sommer?= Date: Sun, 3 Feb 2008 00:58:07 +0100 Subject: git-remote documentation: fix synopsis to match description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the text, the argument of -m is which should be used in the command synopsis, too. Signed-off-by: Jörg Sommer Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 10f6fa58bf..2cbd1f764b 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git-remote' -'git-remote' add [-t ] [-m ] [-f] [--mirror] +'git-remote' add [-t ] [-m ] [-f] [--mirror] 'git-remote' rm 'git-remote' show 'git-remote' prune -- cgit v1.2.3 From 84bb2dfd9f4873c9ca19537efe62219b09ec03bf Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 17 Apr 2008 13:17:20 +0200 Subject: Add a remote.*.mirror configuration option This patch adds a remote.*.mirror configuration option that, when set, automatically puts git-push in --mirror mode for that remote. Furthermore, the option is set automatically by `git remote add --mirror'. The code in remote.c to parse remote.*.skipdefaultupdate had a subtle problem: a comment in the code indicated that special care was needed for boolean options, but this care was not used in parsing the option. Since I was touching related code, I did this fix too. [jc: and I further fixed up the "ignore boolean" code.] Signed-off-by: Paolo Bonzini Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 2cbd1f764b..b20e851973 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -47,9 +47,11 @@ With `-m ` option, `$GIT_DIR/remotes//HEAD` is set up to point at remote's `` branch instead of whatever branch the `HEAD` at the remote repository actually points at. + -In mirror mode, enabled with `--mirror`, the refs will not be stored +In mirror mode, enabled with `\--mirror`, the refs will not be stored in the 'refs/remotes/' namespace, but in 'refs/heads/'. This option -only makes sense in bare repositories. +only makes sense in bare repositories. If a remote uses mirror +mode, furthermore, `git push` will always behave as if `\--mirror` +was passed. 'rm':: -- cgit v1.2.3 From 56ae8df5c7b05ee8982c9447fa31116104dc568f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 May 2008 16:55:27 -0700 Subject: Manual subsection to refer to other pages is SEE ALSO Consistently say so in all caps as it is customary to do so. Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index b20e851973..5c55290ee5 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -128,7 +128,7 @@ $ git merge origin ------------ -See Also +SEE ALSO -------- linkgit:git-fetch[1] linkgit:git-branch[1] -- cgit v1.2.3 From 9e1f0a85c68323830ea117092c55192b17aa3ac8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 6 Jun 2008 09:07:32 +0200 Subject: documentation: move git(7) to git(1) As the "git" man page describes the "git" command at the end-user level, it seems better to move it to man section 1. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 5c55290ee5..e97dc09296 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -146,4 +146,4 @@ Documentation by J. Bruce Fields and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite -- cgit v1.2.3 From 459cf2e9857df069269aa733a7ce9df6f00f88ef Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Sun, 8 Jun 2008 03:36:10 +0200 Subject: Docs: add some long/short options Namely: git-clean.txt: --dry-run --quiet git-count-objects.txt: --verbose git-quiltimport.txt: -n git-remote.txt: -v --verbose Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index e97dc09296..782b0554cf 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -9,7 +9,7 @@ git-remote - manage set of tracked repositories SYNOPSIS -------- [verse] -'git-remote' +'git-remote' [-v | --verbose] 'git-remote' add [-t ] [-m ] [-f] [--mirror] 'git-remote' rm 'git-remote' show @@ -22,6 +22,14 @@ DESCRIPTION Manage the set of repositories ("remotes") whose branches you track. +OPTIONS +------- + +-v:: +--verbose:: + Be a little more verbose and show remote url after name. + + COMMANDS -------- -- cgit v1.2.3 From 0ecfcb3b700e7e3097a55f015894ad75f1097090 Mon Sep 17 00:00:00 2001 From: Olivier Marin Date: Tue, 10 Jun 2008 16:51:08 +0200 Subject: remote show: fix the -n option The perl version accepted a -n flag, to show local informations only without querying remote heads, that seems to have been lost in the C revrite. This restores the older behaviour and add a test case. Signed-off-by: Olivier Marin Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 782b0554cf..7bd024eeba 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git-remote' [-v | --verbose] 'git-remote' add [-t ] [-m ] [-f] [--mirror] 'git-remote' rm -'git-remote' show +'git-remote' show [-n] 'git-remote' prune 'git-remote' update [group] -- cgit v1.2.3 From 8d7679276af861b44e307c9879f6c4774f4944fc Mon Sep 17 00:00:00 2001 From: Olivier Marin Date: Tue, 10 Jun 2008 16:51:35 +0200 Subject: remote prune: print the list of pruned branches This command is really too quiet which make it unconfortable to use. Also implement a --dry-run option, in place of the original -n one, to list stale tracking branches that will be pruned, but do not actually prune them. Add a test case for --dry-run. Signed-off-by: Olivier Marin Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 7bd024eeba..345943a264 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -13,7 +13,7 @@ SYNOPSIS 'git-remote' add [-t ] [-m ] [-f] [--mirror] 'git-remote' rm 'git-remote' show [-n] -'git-remote' prune +'git-remote' prune [-n | --dry-run] 'git-remote' update [group] DESCRIPTION @@ -80,9 +80,8 @@ These stale branches have already been removed from the remote repository referenced by , but are still locally available in "remotes/". + -With `-n` option, the remote heads are not confirmed first with `git -ls-remote `; cached information is used instead. Use with -caution. +With `--dry-run` option, report what branches will be pruned, but do no +actually prune them. 'update':: -- cgit v1.2.3 From b1889c36d85514e5e70462294c561a02c2edfe2b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 30 Jun 2008 01:09:04 -0500 Subject: Documentation: be consistent about "git-" versus "git " Since the git-* commands are not installed in $(bindir), using "git-command " in examples in the documentation is not a good idea. On the other hand, it is nice to be able to refer to each command using one hyphenated word. (There is no escaping it, anyway: man page names cannot have spaces in them.) This patch retains the dash in naming an operation, command, program, process, or action. Complete command lines that can be entered at a shell (i.e., without options omitted) are made to use the dashless form. The changes consist only of replacing some spaces with hyphens and vice versa. After a "s/ /-/g", the unpatched and patched versions are identical. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 345943a264..32db0aed11 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -9,12 +9,12 @@ git-remote - manage set of tracked repositories SYNOPSIS -------- [verse] -'git-remote' [-v | --verbose] -'git-remote' add [-t ] [-m ] [-f] [--mirror] -'git-remote' rm -'git-remote' show [-n] -'git-remote' prune [-n | --dry-run] -'git-remote' update [group] +'git remote' [-v | --verbose] +'git remote' add [-t ] [-m ] [-f] [--mirror] +'git remote' rm +'git remote' show [-n] +'git remote' prune [-n | --dry-run] +'git remote' update [group] DESCRIPTION ----------- -- cgit v1.2.3 From 467c0197fd0a49078d05839ee385046cd3707a5b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 3 Jul 2008 00:28:15 -0500 Subject: Documentation: more "git-" versus "git " changes With git-commands moving out of $(bindir), it is useful to make a clearer distinction between the git subcommand 'git-whatever' and the command you type, `git whatever `. So we use a dash after "git" when referring to the former and not the latter. I already sent a patch doing this same thing, but I missed some spots. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 32db0aed11..3634efd8bf 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -124,7 +124,7 @@ $ git checkout -b nfs linux-nfs/master ... ------------ -* Imitate 'git clone' but track only selected branches +* Imitate 'git-clone' but track only selected branches + ------------ $ mkdir project.git -- cgit v1.2.3 From 04c2407eafa0361439a60fd6240447f3404d014b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 3 Jul 2008 00:36:04 -0500 Subject: manpages: italicize command names in synopses To tell command names from options in a glance. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 3634efd8bf..bb99810ec7 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -10,11 +10,11 @@ SYNOPSIS -------- [verse] 'git remote' [-v | --verbose] -'git remote' add [-t ] [-m ] [-f] [--mirror] -'git remote' rm -'git remote' show [-n] -'git remote' prune [-n | --dry-run] -'git remote' update [group] +'git remote add' [-t ] [-m ] [-f] [--mirror] +'git remote rm' +'git remote show' [-n] +'git remote prune' [-n | --dry-run] +'git remote update' [group] DESCRIPTION ----------- -- cgit v1.2.3 From bf98421a3363696f3b4c8aedc242bfaadc1ce6f6 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 3 Nov 2008 19:26:18 +0100 Subject: Implement git remote rename The new rename subcommand does the followings: 1) Renames the remote.foo configuration section to remote.bar 2) Updates the remote.bar.fetch refspecs 3) Updates the branch.*.remote settings 4) Renames the tracking branches: renames the normal refs and rewrites the symrefs to point to the new refs. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index bb99810ec7..7b227b307f 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -11,6 +11,7 @@ SYNOPSIS [verse] 'git remote' [-v | --verbose] 'git remote add' [-t ] [-m ] [-f] [--mirror] +'git remote rename' 'git remote rm' 'git remote show' [-n] 'git remote prune' [-n | --dry-run] @@ -61,6 +62,11 @@ only makes sense in bare repositories. If a remote uses mirror mode, furthermore, `git push` will always behave as if `\--mirror` was passed. +'rename':: + +Rename the remote named to . All remote tracking branches and +configuration settings for the remote are updated. + 'rm':: Remove the remote named . All remote tracking branches and -- cgit v1.2.3 From 74443f185ed91f3388b0e45838262eb3ec8338aa Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 10 Nov 2008 21:43:03 +0100 Subject: git-remote: document the migration feature of the rename subcommand Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 7b227b307f..fad983e297 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -66,6 +66,10 @@ was passed. Rename the remote named to . All remote tracking branches and configuration settings for the remote are updated. ++ +In case and are the same, and is a file under +`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to +the configuration file format. 'rm':: -- cgit v1.2.3 From bc14fac825d9728c311aaa9d0aecf4960d4a3103 Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Wed, 25 Feb 2009 03:32:25 -0500 Subject: builtin-remote: add set-head subcommand Provide a porcelain command for setting and deleting $GIT_DIR/remotes//HEAD. While we're at it, document what $GIT_DIR/remotes//HEAD is all about. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index fad983e297..c9c0e6f932 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -13,6 +13,7 @@ SYNOPSIS 'git remote add' [-t ] [-m ] [-f] [--mirror] 'git remote rename' 'git remote rm' +'git remote set-head' [-a | -d | ] 'git remote show' [-n] 'git remote prune' [-n | --dry-run] 'git remote update' [group] @@ -53,8 +54,7 @@ is created. You can give more than one `-t ` to track multiple branches without grabbing all branches. + With `-m ` option, `$GIT_DIR/remotes//HEAD` is set -up to point at remote's `` branch instead of whatever -branch the `HEAD` at the remote repository actually points at. +up to point at remote's `` branch. See also the set-head command. + In mirror mode, enabled with `\--mirror`, the refs will not be stored in the 'refs/remotes/' namespace, but in 'refs/heads/'. This option @@ -76,6 +76,30 @@ the configuration file format. Remove the remote named . All remote tracking branches and configuration settings for the remote are removed. +'set-head':: + +Sets or deletes the default branch (`$GIT_DIR/remotes//HEAD`) for +the named remote. Having a default branch for a remote is not required, +but allows the name of the remote to be specified in lieu of a specific +branch. For example, if the default branch for `origin` is set to +`master`, then `origin` may be specified wherever you would normally +specify `origin/master`. ++ +With `-d`, `$GIT_DIR/remotes//HEAD` is deleted. ++ +With `-a`, the remote is queried to determine its `HEAD`, then +`$GIT_DIR/remotes//HEAD` is set to the same branch. e.g., if the remote +`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set +`$GIT_DIR/refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will +only work if `refs/remotes/origin/next` already exists; if not it must be +fetched first. ++ +Use `` to set `$GIT_DIR/remotes//HEAD` explicitly. e.g., "git +remote set-head origin master" will set `$GIT_DIR/refs/remotes/origin/HEAD` to +`refs/remotes/origin/master`. This will only work if +`refs/remotes/origin/master` already exists; if not it must be fetched first. ++ + 'show':: Gives some information about the remote . -- cgit v1.2.3 From efa54803cb1dc15923799f94abf82cb0433c2b9b Mon Sep 17 00:00:00 2001 From: Finn Arne Gangstad Date: Fri, 3 Apr 2009 11:03:44 +0200 Subject: git remote update: New option --prune With the --prune (or -p) option, git remote update will also prune all the remotes that it fetches. Previously, you had to do a manual git remote prune for each of the remotes you wanted to prune, and this could be tedious with many remotes. A single command will now update a set of remotes, and remove all stale branches: git remote update -p [group] Signed-off-by: Finn Arne Gangstad Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index c9c0e6f932..0b6e67dbca 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -16,7 +16,7 @@ SYNOPSIS 'git remote set-head' [-a | -d | ] 'git remote show' [-n] 'git remote prune' [-n | --dry-run] -'git remote update' [group] +'git remote update' [-p | --prune] [group] DESCRIPTION ----------- @@ -125,6 +125,8 @@ the configuration parameter remotes.default will get used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote..skipDefaultUpdate set to true will be updated. (See linkgit:git-config[1]). ++ +With `--prune` option, prune all the remotes that are updated. DISCUSSION -- cgit v1.2.3 From b344e1614b15dfde0ab4dfc175bed1aac39bc264 Mon Sep 17 00:00:00 2001 From: Finn Arne Gangstad Date: Mon, 6 Apr 2009 15:41:02 +0200 Subject: git remote update: Fallback to remote if group does not exist Previously, git remote update would fail unless there was a remote group configured with the same name as the remote. git remote update will now fall back to using the remote if no matching group can be found. This enables "git remote update -p ..." to fetch and prune one or more remotes, for example. Signed-off-by: Finn Arne Gangstad Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-remote.txt') diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 0b6e67dbca..9e2b4eaa38 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -16,7 +16,7 @@ SYNOPSIS 'git remote set-head' [-a | -d | ] 'git remote show' [-n] 'git remote prune' [-n | --dry-run] -'git remote update' [-p | --prune] [group] +'git remote update' [-p | --prune] [group | remote]... DESCRIPTION ----------- -- cgit v1.2.3