[PATCH v6] submodule: Improve documentation of update subcommand

2015-03-02 Thread Michal Sojka
, because it is only effective in case of checkout method of update. Fix all these problems by documenting submodule.*.update in git-submodule.txt and make everybody else refer to it. Helped-by: Junio C Hamano Helped-by: Jens Lehmann Signed-off-by: Michal Sojka --- Documentation/co

[PATCH v5] submodule: Improve documentation of update subcommand

2015-03-02 Thread Michal Sojka
, because it is only effective in case of checkout method of update. Fix all these problems by documenting submodule.*.update in git-submodule.txt and make everybody else refer to it. Helped-by: Junio C Hamano Helped-by: Jens Lehmann Signed-off-by: Michal Sojka --- Documentation/co

Re: [PATCH] submodule: Improve documentation of update subcommand

2015-03-02 Thread Michal Sojka
On Mon, Feb 23 2015, Junio C Hamano wrote: > Michal Sojka writes: > >> The documentation of 'git submodule update' has several problems: > > Thanks, this round looks much better. > >> diff --git a/Documentation/config.txt b/Documentation/config.txt >

[PATCH] submodule: Improve documentation of update subcommand

2015-02-23 Thread Michal Sojka
, because it is only effective in case of checkout method of update. Fix all these problems by documenting submodule.*.update in git-submodule.txt and make everybody else refer to it. Helped-by: Junio C Hamano Helped-by: Jens Lehmann Signed-off-by: Michal Sojka --- Documentation/co

Re: [PATCH v3] submodule: Improve documentation of update subcommand

2015-02-23 Thread Michal Sojka
On Sat, Feb 21 2015, Junio C Hamano wrote: > Michal Sojka writes: >> update:: >> +Update the registered submodules to match what the superproject >> +expects by cloning missing submodules and updating the working >> +tree of the submodules. The "

[PATCH v3] submodule: Improve documentation of update subcommand

2015-02-19 Thread Michal Sojka
, because it is only effective in case of checkout method of update. This patch fixes all these problems. Now, submodule.$name.update is fully documented in git-submodule.txt and the other files just refer to it. This is based on discussion between Junio C Hamano, Jens Lehmann and myself. Signed-

Re: [PATCH v2] submodule: Fix documentation of update subcommand

2015-02-19 Thread Michal Sojka
On Thu, Feb 19 2015, Junio C Hamano wrote: > Michal Sojka writes: > >> The documentation of 'git submodule update' has several problems: >> >> 1) It says that submodule.$name.update can be overridden by --checkout >>only if its value is `none`. >

[PATCH v2] submodule: Fix documentation of update subcommand

2015-02-18 Thread Michal Sojka
les. This patch fixes all three problems. Now, submodule.$name.update is fully documented in config.txt and the other files just refer to it. This is based on discussion between myself, Junio C Hamano and Jens Lehmann. Signed-off-by: Michal Sojka --- Documentation/config.txt

[PATCH] Documentation: Mention comment syntax in gitattributes.txt

2014-12-03 Thread Michal Sojka
gitattributes documentation does not specify how to include comments in gitattribute files. According to parse_attr_line() in attr.c, # can be used to start a comment. This patch add this to the documentation. Signed-off-by: Michal Sojka --- Documentation/gitattributes.txt | 10 -- 1

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Michal Sojka
On Mon, Nov 03 2014, Junio C Hamano wrote: > Jens Lehmann writes: > >> This was introduced in e6a1c43aaf (document submdule.$name.update=none >> option for gitmodules), and I agree with Michal that we should fix it. >> But I think we should rather say "This can be overridden by specifying >> '--me

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Michal Sojka
On Mon, Nov 03 2014, Junio C Hamano wrote: > I did a bit more digging of the history, and came up with this, > which would be with a clearer and fairer description. Also to > clarify, I spelled what Michal's "This" meant to refer to. > > -- >8 -- > From: Mich

[PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Michal Sojka
The documentation says that submodule.$name.update can be overridden by --checkout only if its value is `none`. This is not true, because both implementation and documentation of --checkout specifies that the override applies to all possible values. Signed-off-by: Michal Sojka --- Documentation

Re: Submodules and GIT_ALTERNATE_OBJECT_DIRECTORIES

2014-10-03 Thread Michal Sojka
On Fri, Oct 03 2014, Jens Lehmann wrote: > Am 30.09.2014 um 15:25 schrieb Michal Sojka: >> I'd like to shorten the time needed by our continuous integration (CI) >> tool to clone the source repositories. Currently the full clone takes >> about 10 minutes (even fr

Submodules and GIT_ALTERNATE_OBJECT_DIRECTORIES

2014-09-30 Thread Michal Sojka
Hi list, I'd like to shorten the time needed by our continuous integration (CI) tool to clone the source repositories. Currently the full clone takes about 10 minutes (even from local server). Our main repository has several submodules so the CI tool runs "git submodule update --init". My idea was

Re: git log for only certain branches

2014-04-08 Thread Michal Sojka
On Tue, Apr 08 2014, Robert Dailey wrote: > I have more details about my inquiry on StackOverflow: > http://stackoverflow.com/questions/22823768/view-git-log-with-merges-for-only-certain-branches > > Basically I'd like to know if it is possible to show the graph for > ONLY branches that I list. The

Re: [RFC] git submodule split

2014-04-06 Thread Michal Sojka
On Sun, Apr 06 2014, Jens Lehmann wrote: > Am 02.04.2014 23:52, schrieb Michal Sojka: >> Hello, >> >> I needed to convert a subdirectory of a repo to a submodule and have the >> histories of both repos linked together. I found that this was discussed >> few ye

[RFC] git submodule split

2014-04-02 Thread Michal Sojka
Hello, I needed to convert a subdirectory of a repo to a submodule and have the histories of both repos linked together. I found that this was discussed few years back [1], but the code seemed quite complicated and was not merged. [1]: http://git.661346.n2.nabble.com/RFC-What-s-the-best-UI-for-g

[PATCH] contrib/subtree: Fix make install target

2013-07-30 Thread Michal Sojka
If the libexec directory doesn't exist, git-subtree gets installed as $prefix/share/libexec/git-core file. This patch creates the directory before installing git-subtree file into it. Signed-off-by: Michal Sojka --- contrib/subtree/Makefile | 1 + 1 file changed, 1 insertion(+) diff --

[PATCH 2/4] git-blame.el: Make all line prefixes to have the same length

2013-07-02 Thread Michal Sojka
ense:GPL b52ba1 : ;; Keywords: git, version control, release management Signed-off-by: Michal Sojka --- contrib/emacs/git-blame.el | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el index 18ce

[PATCH 1/4] git-blame.el: Fix buffer local declaration

2013-07-02 Thread Michal Sojka
git-blame-cache was declared buffer-local two times and git-blame-idle-timer is global. The intended meaning was probably to make git-blame-idle-timer buffer-local. Signed-off-by: Michal Sojka --- contrib/emacs/git-blame.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a

[PATCH 4/4] git-blame.el: Change the default prefix format

2013-07-02 Thread Michal Sojka
Now, the format resembles more the default format of `git blame`. Signed-off-by: Michal Sojka --- contrib/emacs/git-blame.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el index 5c8933e..74b1486 100644 --- a/contrib

[PATCH 0/4] Emacs: git-blame.el fixes and enhancements

2013-07-02 Thread Michal Sojka
Hi all, following are a few fixes and enhancements to Emacs' git-blame-mode (contrib/emacs/git-blame.el). Michal Sojka (4): git-blame.el: Fix buffer local declaration git-blame.el: Make all line prefixes to have the same length git-blame.el: Allow displaying author/commit times

[PATCH 3/4] git-blame.el: Allow displaying author/commit times

2013-07-02 Thread Michal Sojka
Signed-off-by: Michal Sojka --- contrib/emacs/git-blame.el | 17 + 1 file changed, 17 insertions(+) diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el index 573f408..5c8933e 100644 --- a/contrib/emacs/git-blame.el +++ b/contrib/emacs/git-blame.el @@ -110,8