On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov wrote:
> Hello,
>
> $ git help cherry-pick
>
> -m parent-number, --mainline parent-number
>Usually you cannot cherry-pick a merge because you do not
>know which side of the merge should be considered the
>mainline.
Hi,
My little bitbucket "cherry-pick" button is failing on Windows from a
"git reset --hard" blowing up.
My situation: Git-2.10.2.windows.1 / Bitbucket-4.14.3 / Windows
10-10.0-amd64. But I suspect even more recent Git will have the same
problem.
Now, I'm pretty far from Kansas here as you'll
Is there any appetite for base64'd commit-id's, using the url-safe
variant (e.g. RFC 4648 [1] with padding removed)?
And so this:
712bad335dfa9c410a83f9873614a19726acb3a8
Becomes this:
cSutM136nEEKg_mHNhShlyass6g
Under the hood things cannot change (e.g., ".git/objects/71/") because
file system
On Tue, Feb 21, 2017 at 7:55 AM, G. Sylvie Davies
wrote:
> On Wed, Feb 1, 2017 at 6:26 PM, Jeff King wrote:
>> As many of you already know, the Git project (as a member of Software
>> Freedom Conservancy) holds a trademark on "Git". This email will try to
>> l
On Wed, Feb 1, 2017 at 6:26 PM, Jeff King wrote:
> As many of you already know, the Git project (as a member of Software
> Freedom Conservancy) holds a trademark on "Git". This email will try to
> lay out a bit of the history and procedure around the enforcement of
> that trademark, along with so
On Wed, Feb 15, 2017 at 12:38 PM, G. Sylvie Davies
wrote:
> On Wed, Feb 15, 2017 at 12:36 PM, G. Sylvie Davies
> wrote:
>> Hi,
>>
>> I have a script that runs the following sequence of commands within a clone:
>>
>> -
>> /usr/bin/git rebase --abor
On Wed, Feb 15, 2017 at 12:36 PM, G. Sylvie Davies
wrote:
> Hi,
>
> I have a script that runs the following sequence of commands within a clone:
>
> -
> /usr/bin/git rebase --abort (took 148ms)
> /usr/bin/git cherry-pick --abort (took 103ms)
> /usr/bin/git clean -d -f
Hi,
I have a script that runs the following sequence of commands within a clone:
-
/usr/bin/git rebase --abort (took 148ms)
/usr/bin/git cherry-pick --abort (took 103ms)
/usr/bin/git clean -d -f -x (took 2007ms)
/usr/bin/git reflog expire --expire=now --all (took 106ms)
/usr/bin/git reset --h
iption. How
> do I get "2017-01-31T17:02:13 | Hilco Wijbenga" to be output?
>
Will this work for you?
$ git show -s --pretty='%cd | %an' --date=format:%FT%R:%S
2017-02-02T10:01:36 | G. Sylvie Davies
I have no idea how portable this might be. As "git help log&quo
On Sat, Jan 28, 2017 at 6:28 AM, Jeff King wrote:
> On Fri, Jan 27, 2017 at 09:42:41PM -0800, G. Sylvie Davies wrote:
>
>> Aside from the usual "git log -cc", I think this should work (replace
>> HEAD with whichever commit you are analyzing):
>>
>> git diff
On Fri, Jan 27, 2017 at 9:51 AM, Jeff King wrote:
> On Fri, Jan 27, 2017 at 11:56:08AM -0500, Michael Spiegel wrote:
>
>> I'm trying to determine whether a merge required a conflict to resolve
>> after the merge has occurred. The git book has some advice
>> (https://git-scm.com/book/en/v2/Git-Tool
On Wed, Jan 4, 2017 at 6:34 PM, G. Sylvie Davies wrote:
> Right now the default variant does this:
>
>> --force-with-lease alone, without specifying the details, will protect all
>> remote refs that are going to be updated by requiring their current value to
>> b
Right now the default variant does this:
> --force-with-lease alone, without specifying the details, will protect all
> remote refs that are going to be updated by requiring their current value to
> be the same as the remote-tracking branch we have for them.
The problem is people sometimes run
13 matches
Mail list logo
