[PATCH 6/6] doc: fix formatting in git-update-ref

2018-10-22 Thread Andreas Heiduk
Remove the parapgraph numbers from lines explaining the reflog format and typeset these lines in monospace. Signed-off-by: Andreas Heiduk --- Documentation/git-update-ref.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-update-ref.txt b

[PATCH 5/6] doc: fix indentation of listing blocks in gitweb.conf.txt

2018-10-22 Thread Andreas Heiduk
'gitweb.conf.txt' uses inconsistent indentation in listing blocks and a mix of listing blocks and literal paragraphs. Both didn't look pretty in the rendered HTML page. Signed-off-by: Andreas Heiduk --- Documentation/gitweb.conf.txt | 25 +++-- 1 file changed, 15 insertions

[PATCH 3/6] doc: fix inappropriate monospace formatting

2018-10-22 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- Documentation/git-upload-pack.txt | 1 + Documentation/git.txt | 10 +- Documentation/gitattributes.txt | 30 +++--- Documentation/gitmodules.txt | 17 ++--- Documentation/gitsubmodules.txt | 14

[PATCH 4/6] doc: fix descripion for 'git tag --format'

2018-10-22 Thread Andreas Heiduk
The '--format=' is now listed in the 'OPTIONS' section, not only the '' string itself. The description moved up a few paragraphs because '' is not a standalone paramater but a parameter for the option '--format'. Signed-off-by: Andreas Heiduk --- Documentation/git-tag.txt | 12 ++-- 1

[PATCH 1/6] doc: clarify boundaries of 'git worktree list --porcelain'

2018-10-22 Thread Andreas Heiduk
: add 'list' command, 2015-10-08) Signed-off-by: Andreas Heiduk --- Documentation/git-worktree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index e2ee9fc21b..73520434f6 100644 --- a/Documentation/git

[PATCH 0/6] various fixes for docs

2018-10-22 Thread Andreas Heiduk
A small batch of fixes for the docs. All but the very first fixes formatting and similar stuff. The first one makes parsing 'git worktree list' more future-proof. Andreas Heiduk (6): doc: clarify boundaries of 'git worktree list --porcelain' doc: fix ASCII art tab spacing doc: fix

Re: Git svn bug on merging svn branches

2018-10-10 Thread Andreas Heiduk
. The paragraphs before these lines give more reasons to avoid a non-linear history in SVN branches. Best regards Andreas Heiduk

Re: [PATCH/RFC] completion: complete all possible -no-

2018-05-14 Thread Andreas Heiduk
Am 14.05.2018 um 19:26 schrieb Duy Nguyen: > On Mon, May 14, 2018 at 7:03 PM, Andreas Heiduk <ashei...@gmail.com> wrote: >> Am 08.05.2018 um 17:24 schrieb Duy Nguyen: >>> On Mon, Apr 23, 2018 at 7:36 AM, Eric Sunshine <sunsh...@sunshineco.com> &g

Re: [PATCH/RFC] completion: complete all possible -no-

2018-05-14 Thread Andreas Heiduk
Am 08.05.2018 um 17:24 schrieb Duy Nguyen: > On Mon, Apr 23, 2018 at 7:36 AM, Eric Sunshine > wrote: >> I haven't looked at the implementation, so this may be an entirely >> stupid suggestion, but would it be possible to instead render the >> completions as? >> >> %

[PATCH v3 5/7] git-svn: remove ''--add-author-from' for 'commit-diff'

2018-05-03 Thread Andreas Heiduk
The subcommand 'commit-diff' does not support the option '--add-author-from'. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Signed-off-by: Eric Wong <e...@80x24.org> --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/g

[PATCH v3 3/7] doc: clarify ignore rules for git ls-files

2018-05-03 Thread Andreas Heiduk
Explain that `git ls-files --ignored` requires at least one of the `--exclude*` options to do its job. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-ls-files.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-files

[PATCH v3 6/7] doc: add note about shell quoting to revision.txt

2018-05-03 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Junio C Hamano <gits...@pobox.com> --- Documentation/revisions.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dfcc49c72c..e7604

[PATCH v3 4/7] doc: add '-d' and '-o' for 'git push'

2018-05-03 Thread Andreas Heiduk
Add the missing `-o` shortcut for `--push-option` to the synopsis. Add the missing `-d` shortcut for `--delete` in the main section. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/git-push.txt | 3 ++- 1 fil

[PATCH v3 7/7] doc: normalize [--options] to [options] in git-diff

2018-05-03 Thread Andreas Heiduk
SYNOPSIS and other manuals use [options] but DESCRIPTION used [--options]. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-diff.txt | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-di

[PATCH v3 2/7] doc: align 'diff --no-index' in text and synopsis

2018-05-03 Thread Andreas Heiduk
Make the two '' parameters in DESCRIPTION mandatory and move the `--options` part to the same place where the other variants show them. And finally make `--no-index` in SYNOPSIS as mandatory as in DESCRIPTION. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Martin Ågren <

[PATCH v3 1/7] doc: improve formatting in githooks.txt

2018-05-03 Thread Andreas Heiduk
Typeset commands and similar things with as `git foo` instead of 'git foo' or 'git-foo' and add linkgit to the commands which run the hooks. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/githoo

[PATCH v3 0/7] Some doc-fixes

2018-05-03 Thread Andreas Heiduk
s/--options/options/. This addresses Eric's and Martin's comments. Andreas Heiduk (7): doc: improve formatting in githooks.txt doc: align 'diff --no-index' in text and synopsis doc: clarify ignore rules for git ls-files doc: add '-d' and '-o' for 'git push' git-svn: remove ''--add-auth

[PATCH v2 7/6] doc: normalize [--options] to [options] in git-diff

2018-04-27 Thread Andreas Heiduk
SYNOPSIS and other manuals use [options] but DESCRIPTION used [--options]. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-diff.txt | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-di

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-27 Thread Andreas Heiduk
Am 27.04.2018 um 20:45 schrieb Martin Ågren: > On 27 April 2018 at 20:28, Andreas Heiduk <ashei...@gmail.com> wrote: >> Am 27.04.2018 um 19:18 schrieb Martin Ågren: >>> On 27 April 2018 at 19:04, Andreas Heiduk <ashei...@gmail.com> wrote: >>>> The two ''

Re: [PATCH v2 6/6] doc: add note about shell quoting to revision.txt

2018-04-27 Thread Andreas Heiduk
Am 27.04.2018 um 19:36 schrieb Eric Sunshine: > On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk <ashei...@gmail.com> wrote: >> Signed-off-by: Andreas Heiduk <ashei...@gmail.com> >> Reviewed-by: Junio C Hamano <gits...@pobox.com> >> --- >> diff --git

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-27 Thread Andreas Heiduk
Am 27.04.2018 um 19:33 schrieb Eric Sunshine: > On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk <ashei...@gmail.com> wrote: >> The two '' parameters are not optional but the option >> '--no-index' is. Also move the `--options` part to the same >> place where the other va

Re: [PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-27 Thread Andreas Heiduk
Am 27.04.2018 um 19:18 schrieb Martin Ågren: > On 27 April 2018 at 19:04, Andreas Heiduk <ashei...@gmail.com> wrote: >> The two '' parameters are not optional but the option >> '--no-index' is. Also move the `--options` part to the same >> place where the other vari

[PATCH v2 4/6] doc: add '-d' and '-o' for 'git push'

2018-04-27 Thread Andreas Heiduk
Add the missing `-o` shortcut for `--push-option` to the synopsis. Add the missing `-d` shortcut for `--delete` in the main section. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/git-push.txt | 3 ++- 1 fil

[PATCH v2 5/6] git-svn: remove ''--add-author-from' for 'commit-diff'

2018-04-27 Thread Andreas Heiduk
The subcommand 'commit-diff' does not support the option '--add-author-from'. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Signed-off-by: Eric Wong <e...@80x24.org> --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/g

[PATCH v2 3/6] doc: clarify ignore rules for git ls-files

2018-04-27 Thread Andreas Heiduk
Explain that `git ls-files --ignored` requires at least one of the `--exclude*` options to do its job. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-ls-files.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-files

[PATCH v2 6/6] doc: add note about shell quoting to revision.txt

2018-04-27 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Junio C Hamano <gits...@pobox.com> --- Documentation/revisions.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dfcc49c72c..c1d3a

[PATCH v2 1/6] doc: improve formatting in githooks.txt

2018-04-27 Thread Andreas Heiduk
Typeset commands and similar things with as `git foo` instead of 'git foo' or 'git-foo' and add linkgit to the commands which run the hooks. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/githoo

[PATCH v2 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-27 Thread Andreas Heiduk
The two '' parameters are not optional but the option '--no-index' is. Also move the `--options` part to the same place where the other variants show them. All three items are already correct in the synopsis. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Reviewed-by: Martin Ågren <

[PATCH v2 0/6] Some doc-fixes

2018-04-27 Thread Andreas Heiduk
This reroll incorporates the comments of the first version, including a "large scale" rewrtie of githooks.txt. I'v added "Reviewed-by" and "Signed-off-by" as appropriate. Andreas Heiduk (6): doc: improve formatting in githooks.txt doc: align 'diff --no-inde

Re: [PATCH 5/6] git-svn: commit-diff does not support --add-author-from

2018-04-27 Thread Andreas Heiduk
Am 17.04.2018 um 08:18 schrieb Eric Wong: > Andreas Heiduk <ashei...@gmail.com> wrote: >> Signed-off-by: Andreas Heiduk <ashei...@gmail.com> > > Thanks. > Signed-off-by: Eric Wong <e...@80x24.org> > > And pushed for Junio: [...] I'd like to keep the

Re: fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-27 Thread Andreas Heiduk
Am 12.04.2018 um 21:36 schrieb Martin Ågren: > On 11 April 2018 at 23:08, Andreas Heiduk <ashei...@gmail.com> wrote: >> - reflow some paragraphs >> --- >> Documentation/githooks.txt | 14 +++--- >> 1 file changed, 7 insertions(+), 7 deletions(-)

Re: RFC: How should we handle un-deleted remote branches?

2018-04-22 Thread Andreas Heiduk
Am 22.04.2018 um 13:17 schrieb Ævar Arnfjörð Bjarmason: > > On Sun, Apr 22 2018, Andreas Heiduk wrote: > >> Am 20.04.2018 um 14:14 schrieb Ævar Arnfjörð Bjarmason: >>> But this is a possible work-around: >>> >>> git init /tmp/empty.git >>

Re: RFC: How should we handle un-deleted remote branches?

2018-04-22 Thread Andreas Heiduk
Am 20.04.2018 um 14:14 schrieb Ævar Arnfjörð Bjarmason: > But this is a possible work-around: > > git init /tmp/empty.git > git remote add avar file:///tmp/empty.git > git remote prune avar > git remote remove avar This won't do it also? git remote prune origin > I

fixup! [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-11 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-diff.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index ee1c509bd3..6593b58299 100644 --- a/Documentation/git-diff.txt

fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-11 Thread Andreas Heiduk
- reflow some paragraphs --- Documentation/githooks.txt | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index be31376767..ab5ce80e13 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt

fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-11 Thread Andreas Heiduk
- add linkgit: to callers of hooks - change 'git-foo' and similar to `git foo` - add some more `` for fsmonitor --- Documentation/githooks.txt | 101 +++-- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/Documentation/githooks.txt

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-11 Thread Andreas Heiduk
So the following two fixups should cleanup that page considerably.

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:13 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk <ashei...@gmail.com> wrote: >> The section 'post-rewrite' in 'githooks.txt' renders only one command >> using backticks (`git commit`) but the other commands using single quotes >

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:14 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk <ashei...@gmail.com> wrote: >> Comparing > > That first line should probably not be there. The diff LGTM. > > Martin > ACK, Thanks

[PATCH 6/6] doc: add note about shell quoting to revision.txt

2018-04-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/revisions.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dfcc49c72c..c1d3a40a90 100644 --- a/Documentation/revisions.txt +++ b/Documen

[PATCH 5/6] git-svn: commit-diff does not support --add-author-from

2018-04-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 636e09048e..11aefadf7a 100644 --- a/Documentation/git-svn.txt +++ b/Documentati

[PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

2018-04-10 Thread Andreas Heiduk
The section 'post-rewrite' in 'githooks.txt' renders only one command using backticks (`git commit`) but the other commands using single quotes ('git-rebase'). Align this formatting to use single quotes. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/githooks.t

[PATCH 3/6] doc: clarify ignore rules for git ls-files

2018-04-10 Thread Andreas Heiduk
Explain that `git ls-files --ignored` requires at least one of the `--exclude*` options to do its job. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-ls-files.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-files

[PATCH 4/6] doc: added '-d' and '-q' for 'git push'

2018-04-10 Thread Andreas Heiduk
Add the missing `-o` shortcut for `--push-option` to the synposis. Add the missing `-d` shortcut for `--delete` in the main section. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-push.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff

[PATCH 0/6] Some doc-fixes

2018-04-10 Thread Andreas Heiduk
I'm flushing a queue of small fixes to the docs. Handling these indiviually is just to much hassle - at least I hope so :-) Andreas Heiduk (6): doc: fix formatting inconsistency in githooks.txt doc: align 'diff --no-index' in text with synopsis doc: clarify ignore rules for git ls-files

Re: [PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file

2018-04-05 Thread Andreas Heiduk
Am 05.04.2018 um 09:51 schrieb Eric Wong: > Thanks for the update. The patch itself looks good, but I > noticed one --show-item isn't supported on SVN 1.8.10 for me. --show-item is indeed a 1.9.0 thing: https://subversion.apache.org/docs/release-notes/1.9.html#svn-info-item > I've tested the

[PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file

2018-03-24 Thread Andreas Heiduk
t with unnecessary stuff. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-svn.txt | 8 +--- perl/Git/SVN.pm | 13 ++--- t/t9130-git-svn-authors-file.sh | 14 ++ t/t9138-git-svn-authors-prog.sh | 25 ++

Re: [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file

2018-03-19 Thread Andreas Heiduk
Am 19.03.2018 um 00:04 schrieb Eric Wong: > Andreas Heiduk <ashei...@gmail.com> wrote: >> The email address in --authors-file and --authors-prog can be empty but >> git-svn translated it into a syntethic email address in the form >> $USERNAME@$REPO_UUID. Now git-

Re: [PATCH v2 0/2] git-svn: --author-prog improvements

2018-03-18 Thread Andreas Heiduk
No comments on this one?

[PATCH v2 1/2] git-svn: search --authors-prog in PATH too

2018-03-11 Thread Andreas Heiduk
r is still retained, but if the file does not exists, then authors-prog is searched for in $PATH as any other command. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Signed-off-by: Eric Wong <e...@80x24.org> --- Documentation/git-svn.txt | 5 + git-svn.perl | 3 +

[PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file

2018-03-11 Thread Andreas Heiduk
. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-svn.txt | 8 +--- perl/Git/SVN.pm | 13 ++--- t/t9130-git-svn-authors-file.sh | 14 ++ t/t9138-git-svn-authors-prog.sh | 25 - 4 files changed, 49 inse

[PATCH v2 0/2] git-svn: --author-prog improvements

2018-03-11 Thread Andreas Heiduk
The first patch has been queued by Eric Wong but by Junio Hamano, so I'm not sure what's the expected procedure. I#M posting it again just in case. The second patch has grown up with some documentation and some tests. Andreas Heiduk (2): git-svn: search --authors-prog in PATH too git-svn

Re: [PATCH 2/2] git-svn: allow empty email-address in authors-prog and authors-file

2018-03-06 Thread Andreas Heiduk
Am 05.03.2018 um 10:37 schrieb Andreas Heiduk: > 2018-03-05 2:42 GMT+01:00 Eric Sunshine <sunsh...@sunshineco.com>: >> On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk <ashei...@gmail.com> wrote: >>> --- >>> diff --git a/perl/Git/SVN.pm b/perl/G

Re: [PATCH 1/2] git-svn: search --authors-prog in PATH too

2018-03-05 Thread Andreas Heiduk
Am 05.03.2018 um 20:48 schrieb Andreas Heiduk: > Am 05.03.2018 um 18:52 schrieb Eric Wong: >> Thanks both, I've queued 1/2 up with Eric S's edits at svn/authors-prog. >> I'm not yet convinced 2/2 is a good change, however. > > I'm not sure which direction your argument poi

Re: [PATCH 1/2] git-svn: search --authors-prog in PATH too

2018-03-05 Thread Andreas Heiduk
Am 05.03.2018 um 18:52 schrieb Eric Wong: > > Thanks both, I've queued 1/2 up with Eric S's edits at svn/authors-prog. > I'm not yet convinced 2/2 is a good change, however. I'm not sure which direction your argument points to: Do you object to a $PATH search at all? Or would you like to

Re: [PATCH 2/2] git-svn: allow empty email-address in authors-prog and authors-file

2018-03-05 Thread Andreas Heiduk
2018-03-05 2:42 GMT+01:00 Eric Sunshine <sunsh...@sunshineco.com>: > On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk <ashei...@gmail.com> wrote: >> The email address in --authors-file and --authors-prog can be empty but >> git-svn translated it into a syntethi

[PATCH 1/2] git-svn: search --authors-prog in PATH too

2018-03-04 Thread Andreas Heiduk
r is still retained, but if the file does not exists, then authors-prog is search in $PATH as any other command. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-svn.txt | 5 + git-svn.perl | 3 ++- 2 files changed, 7 insertions(+), 1 deletio

[PATCH 2/2] git-svn: allow empty email-address in authors-prog and authors-file

2018-03-04 Thread Andreas Heiduk
. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- perl/Git/SVN.pm | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index bc4eed3d75..b0a340b294 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1482,7 +1482,6

Re: Git config multiple values

2017-10-06 Thread Andreas Heiduk
Hi, Am 06.10.2017 um 19:25 schrieb Jonathan Nieder: > Hi, > > Jeff King wrote: >> On Fri, Oct 06, 2017 at 01:10:17PM +0200, aleksander.baranowski wrote: > >>> It's just an opinion, but this behaviour is no consistent for me. >>> >>> If it's not the bug it's a feature just let me know. >> >>

Re: [PATCH] doc: correct command formatting

2017-09-28 Thread Andreas Heiduk
Am 28.09.2017 um 21:34 schrieb Jonathan Nieder: > Andreas Heiduk wrote: > >> +1, Thanks for spotting. > > Thanks for looking it over. Can we add your Reviewed-by? (See [1] > for what this means.) Well, I'd like to see the following occurrence of the same problem solv

Re: [PATCH] doc: correct command formatting

2017-09-28 Thread Andreas Heiduk
Am 28.09.2017 um 16:06 schrieb Adam Dinwoodie: > Leaving spaces around the `-delimeters for commands means asciidoc fails > to parse them as the start of a literal string. Remove an extraneous > space that is causing a literal to not be formatted as such. > > Signed-off-by: Adam Dinwoodie

Re: Commit dropped when swapping commits with rebase -i -p

2017-09-16 Thread Andreas Heiduk
Am 15.09.2017 um 22:52 schrieb Junio C Hamano: > Sebastian Schuberth writes: >> >> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt >> index 6805a74aec..ccd0a04d54 100644 >> --- a/Documentation/git-rebase.txt >> +++ b/Documentation/git-rebase.txt >>

Re: git-svn: Handling of branches created from subfolders

2017-08-20 Thread Andreas Heiduk
Am 19.08.2017 um 14:45 schrieb Jan Teske: > Is there any way to fix such branches from subfolders in a way that they > integrate correctly with the converted git repository, without losing any (or > at least too much) history? If this is not possible with git-svn directly, > maybe I could

Re: git svn show-externals output format

2017-08-19 Thread Andreas Heiduk
Am 19.08.2017 um 10:24 schrieb Alexander Groß: > $ git svn show-externals > > # /trunk/ > /trunk/https://svn.code.sf.net/p/gc-webdav/svn webdav > /trunk/https://svn.code.sf.net/p/gc-webdav/svn@1 webdav-at-revision This is the (bugged) output of `git svn show-externals` for "new style"

Re: [PATCH] fix revisions doc about quoting for ':/' notation

2017-08-16 Thread Andreas Heiduk
Am 16.08.2017 um 05:21 schrieb ryenus: > To make sure the `` in `:/` is seen as one search string, > one should quote/escape `` properly. > > Especially, the example given in the manual `:/fix nasty bug` does not > work because of missing quotes. The examples are now corrected, and a > note about

[PATCH v2] doc: clarify "config --bool" behaviour with empty values

2017-08-14 Thread Andreas Heiduk
`git config --bool xxx.yyy` returns `true` for `[xxx]yyy` but `false` for `[xxx]yyy=` or `[xxx]yyy=""`. This is tested in t1300-repo-config.sh since 09bc098c2. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/config.txt | 10 +- Documentation/git.tx

Re: [PATCH] doc: clarify "config --bool" behaviour with empty values

2017-08-14 Thread Andreas Heiduk
Am 14.08.2017 um 19:53 schrieb Junio C Hamano: > Andreas Heiduk <ashei...@gmail.com> writes: > >> `git config --bool xxx.yyy` returns `true` for `[xxx]yyy` but >> `false` for `[xxx]yyy=` or `[xxx]yyy=""`. This is tested in >> t1300-repo-config.sh since

[PATCH] doc: clarify "config --bool" behaviour with empty values

2017-08-13 Thread Andreas Heiduk
`git config --bool xxx.yyy` returns `true` for `[xxx]yyy` but `false` for `[xxx]yyy=` or `[xxx]yyy=""`. This is tested in t1300-repo-config.sh since 09bc098c2. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/config.txt | 3 ++- Documentation/git.txt

[PATCH] doc: remove unsupported parameter from patch-id

2017-07-27 Thread Andreas Heiduk
The patch is read from standard input and not from a parameter. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-patch-id.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index cf71fba1c..442

[PATCH v2] doc: add missing values "none" and "default" for diff.wsErrorHighlight

2017-07-25 Thread Andreas Heiduk
The values have eluded documentation so far. While at it streamline the wording by grouping relevant parts together. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/diff-config.txt | 11 +++ Documentation/diff-options.txt | 17 - 2 files chang

[PATCH] doc: add missing "none" value for diff.wsErrorHighlight

2017-07-24 Thread Andreas Heiduk
The value has not eluded documentation so far. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/diff-config.txt | 2 +- Documentation/diff-options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/diff-config.txt b/Documentatio

Re: Bug^Feature? fetch protects only current working tree branch

2017-07-24 Thread Andreas Heiduk
Am 24.07.2017 um 00:13 schrieb Junio C Hamano: > Andreas Heiduk <andreas.hei...@mathema.de> writes: > >> A `git fetch . origin/master:master` protects the currently checked out >> branch (HEAD) unless the `-u/--update-head-ok` is supplied. This avoids a >> misma

Bug^Feature? fetch protects only current working tree branch

2017-07-23 Thread Andreas Heiduk
A `git fetch . origin/master:master` protects the currently checked out branch (HEAD) unless the `-u/--update-head-ok` is supplied. This avoids a mismatch between the index and HEAD. BUT branches which are HEADs in other working trees do not get that care - their state is silently screwed up. Is

[PATCH] doc: clarify syntax for %C(auto,...) in pretty formats

2017-06-24 Thread Andreas Heiduk
ing an example helps both worlds. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/pretty-formats.txt | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 38040e95b..b039851

Re: Transform log message during migration svn -> git (using git-svn)

2017-06-20 Thread Andreas Heiduk
Am 20.06.2017 um 14:32 schrieb paul.mat...@s4m.com: > Well this is a possibility, of course. Our problem is that our SVN > repository contains about 220.000 revisions currently. As a colleague of > mine said that the command you suggest might take about 4 seconds per > revision, it would take

Re: [PATCH v1] Configure Git contribution guidelines for github.com

2017-06-15 Thread Andreas Heiduk
Am 15.06.2017 um 18:43 schrieb Junio C Hamano: > Another thing that may regress that you did not mention is that we > would lose a convenient way to _count_ proposed changes coming via > submitGit (i.e. you can simply go to the pull-request page), so that > the number can be compared with the

[PATCH] git-svn: document special options for commit-diff

2017-06-14 Thread Andreas Heiduk
Some options specific for `git svn commit-diff` where not documented so far. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-svn.txt | 15 +++ 1 file changed, 15 insertions(+) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index fba

[PATCH v4] doc: do not use `rm .git/index` when normalizing line endings

2017-06-14 Thread Andreas Heiduk
. The way to do this with Git is to use `read-tree --empty`. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Helped-by: Junio C Hamano <gits...@pobox.com> Helped-by: Torsten Bögershausen <tbo...@web.de> --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insert

[PATCH v3] doc: do not use `rm .git/index` when normalizing line endings

2017-06-13 Thread Andreas Heiduk
. The way to do this with Git is to use `read-tree --empty`. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Helped-by: Junio C Hamano <gits...@pobox.com> Helped-by: Torsten Bögershausen <tbo...@web.de> --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1

Re: [PATCH v2] doc: fix location of index in worktree scenatio

2017-06-12 Thread Andreas Heiduk
he commit: > "doc: normalize the line endings in a worktree scenatio" Well, my patch does not document nor enhance the documentation about EOL normalization per se. > On 10/06/17 19:38, Andreas Heiduk wrote: >> When setting `.gitattributes` in a second worktree, a plain `rm >> .g

[PATCH v2] doc: fix location of index in worktree scenatio

2017-06-10 Thread Andreas Heiduk
When setting `.gitattributes` in a second worktree, a plain `rm .git/index` does not actually delete the index. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> Helped-by: Junio C Hamano <gits...@pobox.com> --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+)

Re: [PATCH] doc: fix location of index in worktree scenatio

2017-06-10 Thread Andreas Heiduk
Am 10.06.2017 um 13:17 schrieb Junio C Hamano: > Andreas Heiduk <ashei...@gmail.com> writes: > >> When setting `.gitattributes` in a second worktree, a plain `rm .git/index` >> does not actually delete the index. >> [...] > Right. > > I however have

[PATCH] doc: fix location of index in worktree scenatio

2017-06-10 Thread Andreas Heiduk
When setting `.gitattributes` in a second worktree, a plain `rm .git/index` does not actually delete the index. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documen

[PATCH v2 2/2] add [--] to usage of filter-branch

2017-06-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2758ae5eb..3a74602ef 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -87,7

[PATCH v2 1/2] add setup step to filter-branch

2017-06-10 Thread Andreas Heiduk
-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-filter-branch.txt | 17 - git-filter-branch.sh| 18 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-

Re: [PATCH 2/2] add [--] to usage of filter-branch

2017-06-09 Thread Andreas Heiduk
Am 09.06.2017 um 15:14 schrieb Junio C Hamano: > Andreas Heiduk <ashei...@gmail.com> writes: > >> Am 03.06.2017 um 12:17 schrieb Andreas Heiduk: >>> Signed-off-by: Andreas Heiduk <ashei...@gmail.com> >>> --- >>> Documentation/git-

[PATCH] doc: describe git svn init --ignore-refs

2017-06-07 Thread Andreas Heiduk
Add the missing documentation for `git svn init --ignore-refs`. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-svn.txt | 16 1 file changed, 16 insertions(+) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 9bee9b0c4..fba

Re: [PATCH 2/2] add [--] to usage of filter-branch

2017-06-05 Thread Andreas Heiduk
Am 03.06.2017 um 12:17 schrieb Andreas Heiduk: > Signed-off-by: Andreas Heiduk <ashei...@gmail.com> > --- > Documentation/git-filter-branch.txt | 3 ++- > git-filter-branch.sh| 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git

[PATCH 1/2] add setup step to filter-branch

2017-06-03 Thread Andreas Heiduk
-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-filter-branch.txt | 16 +++- git-filter-branch.sh| 18 +- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-

[PATCH 2/2] add [--] to usage of filter-branch

2017-06-03 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-filter-branch.txt | 3 ++- git-filter-branch.sh| 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 45c

[PATCH v1] doc: rewrite description for rev-parse --short

2017-05-31 Thread Andreas Heiduk
`git rev-parse --short` is not a generic modifier but just a variant of `--verify` and considers the given length only as a suggestion to ensure uniqueness. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/config.txt| 1 + Documentation/git-rev-parse.tx

Re: [PATCH] doc: Improve description for rev-parse --short

2017-05-30 Thread Andreas Heiduk
Am 30.05.2017 um 06:10 schrieb Junio C Hamano: >> --short=number:: >> Instead of outputting the full SHA-1 values of object names try to >> abbreviate them to a shorter unique name. When no length is specified >> -7 is used. The minimum length is 4. >> +the effective value of

[PATCH] doc: Improve description for rev-parse --short

2017-05-28 Thread Andreas Heiduk
First: `git rev-parse --short` without a number does use a fixed default but `core.abbrev` which in turn uses `find_unique_abbrev` internally. Second: `--short` implies `--verify` since the beginning (d50125085a), so it cannot be used for bulk-shortening ids unfortunately. Signed-off-by: Andreas

[PATCH] doc: filter-branch does not require re-export of vars

2017-05-26 Thread Andreas Heiduk
The function `set_ident` in `filter-branch` exported the variables GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL|DATE) at least since 6f6826c52b in 2007. Therefore the filter scripts don't need to re-eport them again. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-

[PATCH] Documentation: Fix formatting typo in pretty-formats.txt

2017-05-22 Thread Andreas Heiduk
A missing space messed up formatting of the `%(trailers)` format. --- Documentation/pretty-formats.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 47b286b33..38040e95b 100644 ---

[PATCH] Documentation: Fix reference to isExists for interpret-trailers

2017-05-22 Thread Andreas Heiduk
The manual for "git interpret-trailers" mentioned a non-existing literal `overwrite` for its config option `trailer.ifexists`. Fixed by using `replace` instead. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-interpret-trailers.txt | 2 +- 1 file chan

[PATCH v2] Docs: Add some missing options to git-diff.txt

2017-04-11 Thread Andreas Heiduk
nflicts. But so far they were not documented for the central diff command but only for diff-files. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-diff.txt | 14 ++ 1 file changed, 14 insertions(+) diff --git a/Documentation/git-diff.txt b/Documentation/git-d

[PATCH v1] Docs: Add some missing options to git-diff.txt

2017-04-10 Thread Andreas Heiduk
e central diff command but only for diff-files. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-diff.txt | 15 +++ 1 file changed, 15 insertions(+) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index bbab35fca..2bccf4505 100644 ---

[PATCH] Docs: Add some missing options to git-diff.txt

2017-03-30 Thread Andreas Heiduk
git-diff understands "--ours", "--theirs" and "--base" for files with conflicts. But so far they were not documented for the central diff command but only for diff-files. Signed-off-by: Andreas Heiduk <ashei...@gmail.com> --- Documentation/git-diff.txt | 8 ++

[PATCH v3] Documentation: Improve description for core.quotePath

2017-03-02 Thread Andreas Heiduk
Linking the description for pathname quoting to the configuration variable "core.quotePath" removes inconstistent and incomplete sections while also giving two hints how to deal with it: Either with "-c core.quotePath=false" or with "-z". Signed-off-by: Andr

  1   2   >