Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Igor, Igor Djordjevic writes: [...] > Now, not to get misinterpreted to pick sides in "(re)create" vs > "rebase" merge commit discussion, I just think these two (should) have > a different purpose, and actually having both inside interactive rebase > is what

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Plillip and Igor, Igor Djordjevic writes: > Hi Phillip, > > On 02/03/2018 12:31, Phillip Wood wrote: >> >> > Thinking about it overnight, I now suspect that original proposal had a >> > mistake in the final merge step. I think that what you did is a way to >> >

Re: [PATCH] git.el: handle default excludesfile properly

Dorab Patel writes: > Looking deeper into how the function git-get-exclude-files is used, I > see that it is only being called from git-run-ls-files-with-excludes. > So, perhaps, a better (or additional) fix might be to add the > parameter "--exclude-standard" in the call

Re: [RFC PATCH] color: respect the $NO_COLOR convention

"brian m. carlson" writes: > As a note, turning off color can improve accessibility for some people. > I have a co-worker who has deuteranomaly and virtually all colored text > at the terminal poses readability problems. It would be beneficial if > he could just

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

On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk 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-svn behaves like git-commit: If the email > is

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

On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk wrote: > In 36db1eddf9 ("git-svn: add --authors-prog option", 2009-05-14) the path > to authors-prog was made absolute because git-svn changes the current > directoy in some situations. This makes sense if the program is part of

Re: [RFC PATCH] color: respect the $NO_COLOR convention

On Thu, Mar 01, 2018 at 11:06:45AM -0800, Junio C Hamano wrote: > Leah Neukirchen writes: > > > You are right in calling this out an emerging new thing, but the > > second list of that page proves that it will be useful to settle on a > > common configuration, and my hope is by

[no subject]

Good Day, I am Mr. Alfred Cheuk Yu Chow, the Director for Credit & Marketing Chong Hing Bank, Hong Kong, Chong Hing Bank Centre, 24 Des Voeux Road Central, Hong Kong. I have a business proposal of $38,980,369.00. All confirmable documents to back up the claims will be made available to you

[PATCH v9 7/8] convert: add tracing for 'working-tree-encoding' attribute

From: Lars Schneider Add the GIT_TRACE_WORKING_TREE_ENCODING environment variable to enable tracing for content that is reencoded with the 'working-tree-encoding' attribute. This is useful to debug encoding issues. Signed-off-by: Lars Schneider

[PATCH v9 6/8] convert: check for detectable errors in UTF encodings

From: Lars Schneider Check that new content is valid with respect to the user defined 'working-tree-encoding' attribute. Signed-off-by: Lars Schneider --- convert.c| 50 +++

[PATCH v9 8/8] convert: add round trip check based on 'core.checkRoundtripEncoding'

From: Lars Schneider UTF supports lossless conversion round tripping and conversions between UTF and other encodings are mostly round trip safe as Unicode aims to be a superset of all other character encodings. However, certain encodings (e.g. SHIFT-JIS) are known to

[PATCH v9 5/8] convert: add 'working-tree-encoding' attribute

From: Lars Schneider Git recognizes files encoded with ASCII or one of its supersets (e.g. UTF-8 or ISO-8859-1) as text files. All other encodings are usually interpreted as binary and consequently built-in Git text processing tools (e.g. 'git diff') as well as most Git

[PATCH v9 0/8] convert: add support for different encodings

From: Lars Schneider Hi, Patches 1-4,7 are preparation and helper functions. Patch 5,6,8 are the actual change. This series depends on Torsten's 8462ff43e4 (convert_to_git(): safe_crlf/checksafe becomes int conv_flags, 2018-01-13) which is already in master. Changes

[PATCH v9 1/8] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

From: Lars Schneider Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we allocate the buffer for the lower case string with xmallocz(). This already ensures a NUL at the end of the allocated buffer. Remove the unnecessary assignment. Signed-off-by:

[PATCH v9 4/8] utf8: add function to detect a missing UTF-16/32 BOM

From: Lars Schneider If the endianness is not defined in the encoding name, then let's be strict and require a BOM to avoid any encoding confusion. The is_missing_required_utf_bom() function returns true if a required BOM is missing. The Unicode standard instructs to

[PATCH v9 3/8] utf8: add function to detect prohibited UTF-16/32 BOM

From: Lars Schneider Whenever a data stream is declared to be UTF-16BE, UTF-16LE, UTF-32BE or UTF-32LE a BOM must not be used [1]. The function returns true if this is the case. This function is used in a subsequent commit. [1]

[PATCH v9 2/8] strbuf: add xstrdup_toupper()

From: Lars Schneider Create a copy of an existing string and make all characters upper case. Similar xstrdup_tolower(). This function is used in a subsequent commit. Signed-off-by: Lars Schneider --- strbuf.c | 12 strbuf.h |

Re: [PATCH v8 7/7] convert: add round trip check based on 'core.checkRoundtripEncoding'

On Sun, Mar 4, 2018 at 2:08 PM, Lars Schneider wrote: >> On 25 Feb 2018, at 20:50, Eric Sunshine wrote: >> On Sat, Feb 24, 2018 at 11:28 AM, wrote: >>> + if (!re_src || src_len != re_src_len || >>> +

VERY URGENT AND GET BACK TO ME

Greetings My Dear Friend, MY name is Mr.Yaya Bambara i am working in ADB bank I have ($16.4million Dollars) to transfer to your country and if you are interested get back to me immediately for more details.and i we give you 40% for you and 60% for me ok. Mr.Yaya Bambara. Telex Manager African

Re: [PATCH v8 7/7] convert: add round trip check based on 'core.checkRoundtripEncoding'

> On 25 Feb 2018, at 20:50, Eric Sunshine wrote: > > On Sat, Feb 24, 2018 at 11:28 AM, wrote: >> UTF supports lossless conversion round tripping and conversions between >> UTF and other encodings are mostly round trip safe as Unicode aims

[Bug] git log --show-signature print extra carriage return ^M

There is bug using "git log --show-signature" in my installation git 2.16.2.windows.1 gpg (GnuPG) 2.2.4 libgcrypt 1.8.2 that prints (with colors) an extra ^M (carriage return?) at the end of the gpg lines. As an example, the output of "git log --show-signature HEAD" looks like:

information required

= Thanks for your last email response to me. The information required should include the following-: Your full names Your address Telephone number Your private email Occupation Age This is to enable my further discussion with you in confidence. Best

[no subject]

Good Day, I am sending you this message again. I am Mr. Alfred Cheuk Yu Chow, the Director for Credit & Marketing Chong Hing Bank, Hong Kong, Chong Hing Bank Centre, 24 Des Voeux Road Central, Hong Kong. I have a business proposal of $38,980,369.00. All confirmable documents to back

Hopefully

Dear friend, My name is Mr Micheal Rita, I am the Bill and Exchange (assistant) Manager of Bank of Africa Ouagadougou, Burkina Faso. In my department I discovered an abandoned sum of teen million five hundred thousand United State of American dollars (10.5MILLION USA DOLLARS) in an account that

Hello dear,

Hello dear, I am Miss Rachel Jelani. I have very important thing to discuss with you please, this information is very vital. Contact me with my privarte email so we can talk ( rachelrachel...@hotmail.com ) Rachel.

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

In 36db1eddf9 ("git-svn: add --authors-prog option", 2009-05-14) the path to authors-prog was made absolute because git-svn changes the current directoy in some situations. This makes sense if the program is part of the repository but prevents searching via $PATH. The old behaviour is still

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

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-svn behaves like git-commit: If the email is explicitly set to the empty string, the commit does not contain an email address.

Re: git stash push -u always warns "pathspec '...' did not match any files"

On 03.03.2018 16:46, Thomas Gummerer wrote: On 03/03, Marc Strapetz wrote: Reproducible in a test repository with following steps: $ touch untracked $ git stash push -u -- untracked Saved working directory and index state WIP on master: 0096475 init fatal: pathspec 'untracked' did not match

Re: [PATCH v7 0/7] convert: add support for different encodings

On 2018-02-28 14:21, Jeff King wrote: > On Wed, Feb 28, 2018 at 09:20:05AM +0100, Torsten Bögershausen wrote: > >>> 2. auto-detect utf-16 (your patch) >>> - Just Works for existing repositories storing utf-16 >>> >>> - carries some risk of kicking in when people would like it not to

Hello Beautiful

Good day dear, i hope this mail meets you well? my name is Jack, from the U.S. I know this may seem inappropriate so i ask for your forgiveness but i wish to get to know you better, if I may be so bold. I consider myself an easy-going man, adventurous, honest and fun loving person but I am

[PATCH] http.c: shell command evaluation for extraheader

The http.extraHeader config parameter currently only supports storing constant values. There are two main use cases where this fails: 0. Sensitive payloads: frequently this config parameter is used to pass authentication credentials in place of or in addition to the Authorization