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
'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
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
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
: 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
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
.
The paragraphs before these lines give more reasons to avoid a non-linear
history in SVN branches.
Best regards
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
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?
>>
>> %
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
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
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
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
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
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 <
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
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
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
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 ''
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
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
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
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
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
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
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
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
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 <
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
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
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(-)
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
>>
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
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
- 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
- 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
So the following two fixups should cleanup that page considerably.
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
>
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
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
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
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
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
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
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
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
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 ++
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-
No comments on this one?
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 +
.
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
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
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
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
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
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
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
.
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
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.
>>
>>
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
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
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
>>
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
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"
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
`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
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
`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
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
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
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
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
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
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
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
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
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
. 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
. 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
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
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(+)
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
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
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
-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-
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-
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
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
-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-
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
`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
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
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
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-
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
---
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
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
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
---
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 ++
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 - 100 of 110 matches
Mail list logo