Tight submodule bindings (was: Preferred local submodule branches)

2014-01-11 Thread W. Trevor King
On Wed, Jan 08, 2014 at 10:17:51PM -0800, W. Trevor King wrote: > In another branch of the submodule thread Francesco kicked off, I > mentioned that we could store the preferred local submodule branch on > a per-superbranch level if we used the > .git/modules//config for local overrides [1]. Here'

Git: Question about specific subtree usage

2014-01-11 Thread THILLOSEN Andreas
Hi, I have a question about a specific use case for subtrees, but I'm not sure if is really possible (hence my e-mail, because all my tests failed so far...) >From what I have read, subtrees are used mainly to: - Import inside a working git repository, other git repositories... it's a little like

Re: [PATCH 0/6] Make 'git help everyday' work

2014-01-11 Thread Philip Oakley
From: "Junio C Hamano" "Philip Oakley" writes: From: "Junio C Hamano" I think we already use a nicer way to set up a page alias to keep old links working than making a copy in Documentation/; please mimic that if possible. This was mainly about ensuring that the 'git help' command could a

Error in documentation for @{-n} in gitrevisions

2014-01-11 Thread Kevin
While discussing the behavior of "git checkout -", I apparently was confused because the documentation states: The construct @{-} means the th branch checked out before the current one. But experimenting with it, it also takes you back to previously checkout commits. git-checkout-at-minus-on

[PATCH] Fix asciidoc header in pack-heuristics.txt

2014-01-11 Thread Thomas Ackermann
Create a proper header when formatted as html. Signed-off-by: Thomas Ackermann --- Documentation/technical/pack-heuristics.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.txt index

[PATCH 1/2] completion: complete merge-base options

2014-01-11 Thread John Keeping
Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 6 ++ 1 file changed, 6 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4fe5ce3..e74d402 100644 --- a/contrib/completion/git-completion.bash +++ b/contri

[PATCH 2/2] completion: handle --[no-]fork-point options to git-rebase

2014-01-11 Thread John Keeping
Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e74d402..3c1a11f 100644 --- a/contrib/completion/git-completion.bash ++

[PATCH] Create HTML for technical/http-protocol.txt

2014-01-11 Thread Thomas Ackermann
- Add to Documentation/Makefile - Start every TODO with a new line - Fix indentation error Signed-off-by: Thomas Ackermann --- Documentation/Makefile| 1 + Documentation/technical/http-protocol.txt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Docum