Re: [PATCH 3/3] Makefile: optionally symlink libexec/git-core binaries to bin/git

2018-03-16 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 16 2018, Johannes Schindelin jotted: > Hi Linus. > > On Thu, 15 Mar 2018, Linus Torvalds wrote: > >> We do end up still using the dashed form for certain things, but they >> are already special-cased (ie things like "git-receive-pack" and >> "git-shell" that very much get executed dir

RE

2018-03-16 Thread Sheng li Hung
I am Mr.Sheng Li Hung, from china I got your information while search for a reliable person, I have a very profitable business proposition for you and i can assure you that you will not regret been part of this mutual beneficial transaction after completion. Kindly get back to me for more details o

Re: [PATCH 1/2] rebase: support --signoff with implicit rebase

2018-03-16 Thread Johannes Schindelin
Hi Phillip, On Thu, 15 Mar 2018, Phillip Wood wrote: > On 15/03/18 10:18, Johannes Schindelin wrote: > > > As I mentioned in my reply to Junio's comment, it'd be awesome if > > --interactive --signoff was supported (and likewise --merge > > --signoff), but it feels like an undue feature request t

CONTACT DHL OFFICE IMMEDIATELY FOR DELIVERY OF YOUR ATM MASTERCARD

2018-03-16 Thread MR Paul Ogie
Attention; Beneficiary, This is to official inform you that we have been having meetings for the past three (3) weeks which ended two days ago with MR. JIM YONG KIM the Former world bank president and other seven continent presidents on the congress we treated on solution to scam victim problem

Re: [PATCH v6 00/14] Serialized Git Commit Graph

2018-03-16 Thread Johannes Schindelin
Hi Junio, On Thu, 15 Mar 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Stolee, you definitely want to inspect those changes (`git log --check` > > was introduced to show you whitespace problems). If all of those > > whitespace issues are unintentional, you can fix them using `

Re: [PATCH 3/3] Makefile: optionally symlink libexec/git-core binaries to bin/git

2018-03-16 Thread Johannes Schindelin
Hi Linus. On Thu, 15 Mar 2018, Linus Torvalds wrote: > We do end up still using the dashed form for certain things, but they > are already special-cased (ie things like "git-receive-pack" and > "git-shell" that very much get executed directly, and for fundamental > reasons). Please do elaborate.

Re: [ANNOUNCE] Git v2.17.0-rc0

2018-03-16 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 16 2018, Junio C. Hamano jotted: > gitweb: hard-depend on the Digest::MD5 5.8 module I've just noticed this now, but while this module is in 5.8 RedHat's butchered perl doesn't have it in the base system, thus this introduces the do-we-even-care regression that git's full test

[PATCH v3 1/3] add -p: select individual hunk lines

2018-03-16 Thread Phillip Wood
From: Phillip Wood When I end up editing hunks it is almost always because I want to stage a subset of the lines in the hunk. Doing this by editing the hunk is inconvenient and error prone (especially so if the patch is going to be reversed before being applied). Instead offer an option for add -

[PATCH v3 3/3] add -p: optimize line selection for short hunks

2018-03-16 Thread Phillip Wood
From: Phillip Wood If there are fewer than ten changes in a hunk then make spaces optional when selecting individual lines. This means that for short hunks one can just type 1-357 to stage lines 1, 2, 3, 5 & 7. Signed-off-by: Phillip Wood --- Notes: changes since v2: - removed code th

[PATCH v3 0/3] add -p: select individual hunk lines

2018-03-16 Thread Phillip Wood
From: Phillip Wood Since v2 I've updated the patches to use '-' instead of '^' to invert the selection to match the rest of add -i and clean -i. These patches build on top of the recount fixes in [1]. The commit message for the first patch describes the motivation: "When I end up editing hunks

[PATCH v3 2/3] add -p: allow line selection to be inverted

2018-03-16 Thread Phillip Wood
From: Phillip Wood If the list of lines to be selected begins with '-' select all the lines except the ones listed. Signed-off-by: Phillip Wood --- Notes: changes since v2: - use '-' to invert the selection instead of '^' to be consistent with the rest of add -i and clean -i.

[PATCH] mergetools: enable tortoisemerge as difftool

2018-03-16 Thread Kai
TortoiseMerge/TortoiseGitMerge can also be used to view and edit file differences. This change allows configuring tortoisemerge not only as mergetool but as difftool as well. --- mergetools/tortoisemerge | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mergetool

Shipment delivery

2018-03-16 Thread Fedex Express Service
See attached file for details

Hello

2018-03-16 Thread samson ogele
Hello, Can I trust and share this information with you?

URGENT BSINESS ASSISTANT NEEDED

2018-03-16 Thread Mr Rhaji Haid
Dear Friend You may be surprise to receive this mail since you don’t know me personally, but with due respect, trust and humility, I write to you this proposal. I am Mr. Rhaji Haid the son of MrTariq Haid of Darfur Sudan. It is indeed my pleasure to contact you for assistance of a business ventu

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

2018-03-16 Thread Sergey Organov
Hi Buga, Igor Djordjevic writes: > Hi Sergey, [...] >> As I said, putting myself on the user side, I'd prefer entirely separate >> first step of the algorithm, exactly as written, with its own conflict >> resolution, all running entirely the same way as it does with non-merge >> commits. I'm u

Re: [PATCH v2 3/5] ref-filter: change parsing function error handling

2018-03-16 Thread Оля Тележная
2018-03-16 1:48 GMT+03:00 Junio C Hamano : > Olga Telezhnaya writes: > >> Continue removing any printing from ref-filter formatting logic, >> so that it could be more general. > > Hmm. > >> Change the signature of parse_ref_filter_atom() by changing return value, >> adding previous return value to

Re: [PATCH v2 5/5] ref-filter: get_ref_atom_value() error handling

2018-03-16 Thread Оля Тележная
2018-03-15 23:47 GMT+03:00 Martin Ågren : > I skimmed the first four patches of this v2. It seems that patches 1 and > 4 are identical to v2. Patches 2 and 3 have very straightforward changes > based on my earlier comments. Let's see what this patch is about. :-) Yes, you are right. > > On 14 Mar

Re: [PATCH v2 5/5] ref-filter: get_ref_atom_value() error handling

2018-03-16 Thread Оля Тележная
2018-03-16 0:01 GMT+03:00 Eric Sunshine : > On Thu, Mar 15, 2018 at 4:47 PM, Martin Ågren wrote: >> These are "real" errors and yield several more changes in the remainder. >> Ignoring those BUG-type messages at the beginning of this patch would >> give a patch like the one below. >> >> +static in

<    1   2