[PATCH] Documentation: git diff --check detects conflict markers

Signed-off-by: Ori Avtalion --- Documentation/diff-options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 306b7e3..32f48ed 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff

Re: Warning about conflict markers - undocumented 'diff --check' feature & suggestion

On Tue, Mar 29, 2016 at 9:23 PM, Junio C Hamano wrote: > Ori Avtalion writes: > I am not sure what "similar functionality" you are imagining. > > "git add" does not show any changes, it just does what it was told > to do. If the user is unsure, s/he should mak

Re: Warning about conflict markers - undocumented 'diff --check' feature & suggestion

On Tue, Mar 29, 2016 at 2:01 AM, Junio C Hamano wrote: > Ori Avtalion writes: > > Thanks for digging (even though I do not think the message you > quoted has much to do with this). Oops, you are correct! I had several tabs open digging through the archives and picked the wrong one :

Warning about conflict markers - undocumented 'diff --check' feature & suggestion

A bug report and a suggestion: `git diff --check` has been warning about conflict markers since 2008: https://marc.info/?l=git&m=122398500726634&w=2 This is an undocumented feature. The current documentation for the flag only mentions "whitespace errors". This check will also be useful in `git a

[BUG] 'git show' gives duplicate errors for ambiguous args

With the git.git repository: $ git show abcd error: short SHA1 abcd is ambiguous. error: short SHA1 abcd is ambiguous. fatal: ambiguous argument 'abcd': unknown revision or path not in the working tree. Use '--' to separate paths from revisions The "is ambiguous" message shouldn't be sh