Re: git fetch: where are the downloaded objects stored?
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:44:19
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · git fetch: where are the downloaded objects stored? · Paolo Ciarrocchi <hidden>
- 2016-06-15 · Re: git fetch: where are the downloaded objects stored? · Matthieu Moy <hidden>
- 2016-06-15 · Re: git fetch: where are the downloaded objects stored? · Paolo Ciarrocchi <hidden>
- 2016-06-15 · Re: git fetch: where are the downloaded objects stored? · Jakub Narebski <hidden>
- 2016-06-15 · Re: git fetch: where are the downloaded objects stored? · Sergei Organov <hidden>
"Paolo Ciarrocchi" [off-list ref] writes:
"A merge is always between the current HEAD and one or more remote branch heads"
I think this is just wrong. Would this be correct?
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0c9ad7f..e46dea1 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt@@ -68,7 +68,7 @@ HOW MERGE WORKS --------------- A merge is always between the current `HEAD` and one or more -remote branch heads, and the index file must exactly match the +branch heads (remote or local), and the index file must exactly match the tree of `HEAD` commit (i.e. the contents of the last commit) when it happens. In other words, `git-diff --cached HEAD` must report no changes.
--
Matthieu