* [PATCH v6 1/4] gitfaq: files in .gitignore are tracked
@ 2020-05-06 8:00 Shourya Shukla
2020-05-06 8:00 ` [PATCH v6 2/4] gitfaq: changing the remote of a repository Shourya Shukla
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Shourya Shukla @ 2020-05-06 8:00 UTC (permalink / raw)
To: git; +Cc: gitster, newren, sandals, Shourya Shukla
Add issue in 'Common Issues' section which addresses the problem of
Git tracking files/paths mentioned in '.gitignore'.
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
---
Documentation/gitfaq.txt | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index 1cf83df118..11d9bac859 100644
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -223,6 +223,16 @@ a file checked into the repository which is a template or set of defaults which
can then be copied alongside and modified as appropriate. This second, modified
file is usually ignored to prevent accidentally committing it.
+[[files-in-.gitignore-are-tracked]]
+I asked Git to ignore various files, yet they are still tracked::
+ A `gitignore` file ensures that certain file(s) which are not
+ tracked by Git remain untracked. However, sometimes particular
+ file(s) may have been tracked before adding them into the
+ `.gitignore`, hence they still remain tracked. To untrack and
+ ignore files/patterns, use `git rm --cached <file/pattern>`
+ and add a pattern to `.gitignore` that matches the <file>.
+ See linkgit:gitignore[5] for details.
+
Hooks
-----
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 2/4] gitfaq: changing the remote of a repository
2020-05-06 8:00 [PATCH v6 1/4] gitfaq: files in .gitignore are tracked Shourya Shukla
@ 2020-05-06 8:00 ` Shourya Shukla
2020-05-06 17:17 ` Junio C Hamano
2020-05-06 8:00 ` [PATCH v6 3/4] gitfaq: partial cloning " Shourya Shukla
2020-05-06 8:00 ` [PATCH v6 4/4] gitfaq: fetching and pulling " Shourya Shukla
2 siblings, 1 reply; 8+ messages in thread
From: Shourya Shukla @ 2020-05-06 8:00 UTC (permalink / raw)
To: git; +Cc: gitster, newren, sandals, Shourya Shukla
Add issue in 'Common Issues' section which addresses the problem of
changing the remote of a repository.
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
---
Documentation/gitfaq.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index 11d9bac859..875cfa0acd 100644
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -233,6 +233,17 @@ I asked Git to ignore various files, yet they are still tracked::
and add a pattern to `.gitignore` that matches the <file>.
See linkgit:gitignore[5] for details.
+[[changing-remote-of-the-repository]]
+I want to change the remote of my repository. How do I do that?::
+ A remote is an identifier for a location to which Git pushes your
+ changes as well as fetches any new changes from (if any). There
+ might be different circumstances in which one might need to change
+ the remote URL (see linkgit:git-remote[1]). To change the remote URL
+ one may use: git remote set-url <name> <newurl>
++
+One can list the remotes of a repository using `git remote -v` command.
+The default name of a remote is 'origin'.
+
Hooks
-----
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 3/4] gitfaq: partial cloning a repository
2020-05-06 8:00 [PATCH v6 1/4] gitfaq: files in .gitignore are tracked Shourya Shukla
2020-05-06 8:00 ` [PATCH v6 2/4] gitfaq: changing the remote of a repository Shourya Shukla
@ 2020-05-06 8:00 ` Shourya Shukla
2020-05-06 16:16 ` Elijah Newren
2020-05-06 8:00 ` [PATCH v6 4/4] gitfaq: fetching and pulling " Shourya Shukla
2 siblings, 1 reply; 8+ messages in thread
From: Shourya Shukla @ 2020-05-06 8:00 UTC (permalink / raw)
To: git; +Cc: gitster, newren, sandals, Shourya Shukla
Add issue in 'Common issue' section which covers issues with cloning
large repositories. Use partial cloning to selectively clone the
repository.
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
---
Documentation/gitfaq.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index 875cfa0acd..5dfbb32089 100644
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -244,6 +244,17 @@ I want to change the remote of my repository. How do I do that?::
One can list the remotes of a repository using `git remote -v` command.
The default name of a remote is 'origin'.
+[[partial-cloning]]
+The repository I am trying to clone is too big. Is there an alternative
+way of cloning it in lesser space?::
+ A good way to save space when cloning a repository is by using
+ `partial clones`. A partial clone will clone the full history of
+ the repository but will skip out the entities specified by the
+ `--filter` option one uses in `git clone`. Any entity which has
+ not been cloned to save space can be cloned on-demand (hence this
+ presumes that the user has an always-on network connection to the
+ original repository). See linkgit:partial-clone[1].
+
Hooks
-----
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 4/4] gitfaq: fetching and pulling a repository
2020-05-06 8:00 [PATCH v6 1/4] gitfaq: files in .gitignore are tracked Shourya Shukla
2020-05-06 8:00 ` [PATCH v6 2/4] gitfaq: changing the remote of a repository Shourya Shukla
2020-05-06 8:00 ` [PATCH v6 3/4] gitfaq: partial cloning " Shourya Shukla
@ 2020-05-06 8:00 ` Shourya Shukla
2020-05-06 16:20 ` Elijah Newren
2 siblings, 1 reply; 8+ messages in thread
From: Shourya Shukla @ 2020-05-06 8:00 UTC (permalink / raw)
To: git; +Cc: gitster, newren, sandals, Shourya Shukla
Add an issue in 'Common Issues' section which addresses the confusion
between performing a 'fetch' and a 'pull'.
Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
---
Documentation/gitfaq.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index 5dfbb32089..53e3844374 100644
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -255,6 +255,14 @@ way of cloning it in lesser space?::
presumes that the user has an always-on network connection to the
original repository). See linkgit:partial-clone[1].
+[[fetching-and-pulling]]
+How do I know if I want to do a fetch or a pull?::
+ A fetch stores a copy of the latest changes from the remote
+ repository, without modifying the working tree or current branch.
+ You can then at your leisure inspect, merge, rebase on top of, or
+ ignore the upstream changes. A pull consists of a fetch followed
+ immediately by either a merge or rebase. See linkgit:git-pull[1].
+
Hooks
-----
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 3/4] gitfaq: partial cloning a repository
2020-05-06 8:00 ` [PATCH v6 3/4] gitfaq: partial cloning " Shourya Shukla
@ 2020-05-06 16:16 ` Elijah Newren
0 siblings, 0 replies; 8+ messages in thread
From: Elijah Newren @ 2020-05-06 16:16 UTC (permalink / raw)
To: Shourya Shukla; +Cc: Git Mailing List, Junio C Hamano, brian m. carlson
On Wed, May 6, 2020 at 1:00 AM Shourya Shukla
<shouryashukla.oo@gmail.com> wrote:
>
> Add issue in 'Common issue' section which covers issues with cloning
> large repositories. Use partial cloning to selectively clone the
> repository.
>
> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
> ---
> Documentation/gitfaq.txt | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
> index 875cfa0acd..5dfbb32089 100644
> --- a/Documentation/gitfaq.txt
> +++ b/Documentation/gitfaq.txt
> @@ -244,6 +244,17 @@ I want to change the remote of my repository. How do I do that?::
> One can list the remotes of a repository using `git remote -v` command.
> The default name of a remote is 'origin'.
>
> +[[partial-cloning]]
> +The repository I am trying to clone is too big. Is there an alternative
> +way of cloning it in lesser space?::
> + A good way to save space when cloning a repository is by using
> + `partial clones`. A partial clone will clone the full history of
> + the repository but will skip out the entities specified by the
> + `--filter` option one uses in `git clone`. Any entity which has
> + not been cloned to save space can be cloned on-demand (hence this
Looks like you have a tab instead of a space between 'cloned' and 'on-demand'.
> + presumes that the user has an always-on network connection to the
> + original repository). See linkgit:partial-clone[1].
> +
> Hooks
> -----
>
> --
> 2.26.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 4/4] gitfaq: fetching and pulling a repository
2020-05-06 8:00 ` [PATCH v6 4/4] gitfaq: fetching and pulling " Shourya Shukla
@ 2020-05-06 16:20 ` Elijah Newren
2020-05-06 17:19 ` Junio C Hamano
0 siblings, 1 reply; 8+ messages in thread
From: Elijah Newren @ 2020-05-06 16:20 UTC (permalink / raw)
To: Shourya Shukla; +Cc: Git Mailing List, Junio C Hamano, brian m. carlson
Hi Shourya,
On Wed, May 6, 2020 at 1:00 AM Shourya Shukla
<shouryashukla.oo@gmail.com> wrote:
>
> Add an issue in 'Common Issues' section which addresses the confusion
> between performing a 'fetch' and a 'pull'.
>
> Helped-by: Elijah Newren <newren@gmail.com>
> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
> ---
> Documentation/gitfaq.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
> index 5dfbb32089..53e3844374 100644
> --- a/Documentation/gitfaq.txt
> +++ b/Documentation/gitfaq.txt
> @@ -255,6 +255,14 @@ way of cloning it in lesser space?::
> presumes that the user has an always-on network connection to the
> original repository). See linkgit:partial-clone[1].
>
> +[[fetching-and-pulling]]
> +How do I know if I want to do a fetch or a pull?::
> + A fetch stores a copy of the latest changes from the remote
> + repository, without modifying the working tree or current branch.
> + You can then at your leisure inspect, merge, rebase on top of, or
> + ignore the upstream changes. A pull consists of a fetch followed
> + immediately by either a merge or rebase. See linkgit:git-pull[1].
Looks like you have a tab instead of a space between 'immediately' and 'by'.
> Hooks
> -----
>
> --
> 2.26.2
Other than the two small spacing issues, the series looks good to me.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 2/4] gitfaq: changing the remote of a repository
2020-05-06 8:00 ` [PATCH v6 2/4] gitfaq: changing the remote of a repository Shourya Shukla
@ 2020-05-06 17:17 ` Junio C Hamano
0 siblings, 0 replies; 8+ messages in thread
From: Junio C Hamano @ 2020-05-06 17:17 UTC (permalink / raw)
To: Shourya Shukla; +Cc: git, newren, sandals
Shourya Shukla <shouryashukla.oo@gmail.com> writes:
> Add issue in 'Common Issues' section which addresses the problem of
> changing the remote of a repository.
>
> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
> ---
> Documentation/gitfaq.txt | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
> index 11d9bac859..875cfa0acd 100644
> --- a/Documentation/gitfaq.txt
> +++ b/Documentation/gitfaq.txt
> @@ -233,6 +233,17 @@ I asked Git to ignore various files, yet they are still tracked::
> and add a pattern to `.gitignore` that matches the <file>.
> See linkgit:gitignore[5] for details.
>
> +[[changing-remote-of-the-repository]]
> +I want to change the remote of my repository. How do I do that?::
> + A remote is an identifier for a location to which Git pushes your
> + changes as well as fetches any new changes from (if any). There
> + might be different circumstances in which one might need to change
> + the remote URL (see linkgit:git-remote[1]). To change the remote URL
> + one may use: git remote set-url <name> <newurl>
Up to this point it is a well written answer to "how do I change the remote".
> +One can list the remotes of a repository using `git remote -v` command.
> +The default name of a remote is 'origin'.
This is not. Drop the paragraph, perhaps?
> Hooks
> -----
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v6 4/4] gitfaq: fetching and pulling a repository
2020-05-06 16:20 ` Elijah Newren
@ 2020-05-06 17:19 ` Junio C Hamano
0 siblings, 0 replies; 8+ messages in thread
From: Junio C Hamano @ 2020-05-06 17:19 UTC (permalink / raw)
To: Elijah Newren; +Cc: Shourya Shukla, Git Mailing List, brian m. carlson
Elijah Newren <newren@gmail.com> writes:
> Hi Shourya,
>
> On Wed, May 6, 2020 at 1:00 AM Shourya Shukla
> <shouryashukla.oo@gmail.com> wrote:
>>
>> Add an issue in 'Common Issues' section which addresses the confusion
>> between performing a 'fetch' and a 'pull'.
>>
>> Helped-by: Elijah Newren <newren@gmail.com>
>> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
>> ---
>> Documentation/gitfaq.txt | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
>> index 5dfbb32089..53e3844374 100644
>> --- a/Documentation/gitfaq.txt
>> +++ b/Documentation/gitfaq.txt
>> @@ -255,6 +255,14 @@ way of cloning it in lesser space?::
>> presumes that the user has an always-on network connection to the
>> original repository). See linkgit:partial-clone[1].
>>
>> +[[fetching-and-pulling]]
>> +How do I know if I want to do a fetch or a pull?::
>> + A fetch stores a copy of the latest changes from the remote
>> + repository, without modifying the working tree or current branch.
>> + You can then at your leisure inspect, merge, rebase on top of, or
>> + ignore the upstream changes. A pull consists of a fetch followed
>> + immediately by either a merge or rebase. See linkgit:git-pull[1].
>
> Looks like you have a tab instead of a space between 'immediately' and 'by'.
Good eyes. Otherwise the contents of this new paragraph looks OK to
me.
There is no "git partial-clone" command, so the reference at the end
of the previous paragraph looks bogus, but that is not a fault of
this step.
Thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-05-06 17:19 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-06 8:00 [PATCH v6 1/4] gitfaq: files in .gitignore are tracked Shourya Shukla
2020-05-06 8:00 ` [PATCH v6 2/4] gitfaq: changing the remote of a repository Shourya Shukla
2020-05-06 17:17 ` Junio C Hamano
2020-05-06 8:00 ` [PATCH v6 3/4] gitfaq: partial cloning " Shourya Shukla
2020-05-06 16:16 ` Elijah Newren
2020-05-06 8:00 ` [PATCH v6 4/4] gitfaq: fetching and pulling " Shourya Shukla
2020-05-06 16:20 ` Elijah Newren
2020-05-06 17:19 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).