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

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 --- Documentation/git-diff.txt | 8 1 file changed,

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

or the central diff command but only for diff-files. Signed-off-by: Andreas Heiduk --- 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 --- a/Documentation/git

Bug^Feature? fetch protects only current working tree branch

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

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

Am 24.07.2017 um 00:13 schrieb Junio C Hamano: > Andreas Heiduk 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 >> mismatch between the index and HEAD. BUT

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

The value has not eluded documentation so far. Signed-off-by: Andreas Heiduk --- 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/Documentation/diff-config.txt index

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

The values have eluded documentation so far. While at it streamline the wording by grouping relevant parts together. Signed-off-by: Andreas Heiduk --- Documentation/diff-config.txt | 11 +++ Documentation/diff-options.txt | 17 - 2 files changed, 15 insertions(+), 13

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

The patch is read from standard input and not from a parameter. Signed-off-by: Andreas Heiduk --- 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..442caff8a 100644 --- a

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

`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 --- Documentation/config.txt | 3 ++- Documentation/git.txt| 3 ++- 2 files changed, 4

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

Am 14.08.2017 um 19:53 schrieb Junio C Hamano: > Andreas Heiduk 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 09bc098c2. &

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

`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 --- Documentation/config.txt | 10 +- Documentation/git.txt| 3 ++- 2 files

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

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

Re: git svn show-externals output format

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" svn:extern

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

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 prepar

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

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 >> @@ -782,10 +782,11 @@ ca

Re: [PATCH] doc: correct command formatting

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: [PATCH] doc: correct command formatting

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

Re: Git config multiple values

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. >> >> It's

<    1   2