Re: git stash ; git stash pop unstages all staged changes

Hi Marten, On 30/01/2018 11:05, Martin Häcker wrote: > > I just lost quite some work, because `git stash; git stash pop` > doesn’t seem to understand the concept of the index correctly. I`m afraid it actually seems you`re not fully understanding how `git stash pop` works - but the good news

Re: Bug Report: Subtrees and GPG Signed Commits

Hi, just following up on this bug report. I have not heard back. Is there additional information that's needed? Is there a better place to file bug reports? Additionally, I have confirmed that this bug still exists with git version 2.16.1. Thanks On Thu, Jan 18, 2018 at 11:19 AM, Stephen R

Re: [PATCH v5 4/7] utf8: add function to detect a missing UTF-16/32 BOM

tbo...@web.de writes: > 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 > has_missing_utf_bom() function returns true if a required BOM is > missing. > > The

Re: Creating sparse checkout in a new linked git worktree

On Tue, Jan 30, 2018 at 9:25 AM, Jessie Hernandez wrote: >> The sparse-checkout file is specific to each worktree, which allows you > to control "sparsity" on a worktree by worktree basis. Therefore, you > should create $GIT_DIR/worktrees//info/sparse-checkout instead >

Re: Shawn Pearce has died

On Mon, Jan 29, 2018 at 11:15:55PM -0800, Chris DiBona wrote: > That's a fantastic idea. When is the contrib summit and is it open to > others? I could send someone ... It's March 7th in Barcelona. Details are here: https://public-inbox.org/git/20180119001034.ga29...@sigill.intra.peff.net/

Re: [PATCH v2 00/10] rebase -i: offer to recreate merge commits

On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin wrote: > Once upon a time, I dreamt of an interactive rebase that would not > flatten branch structure, but instead recreate the commit topology > faithfully. > > My original attempt was --preserve-merges, but that

Re: Shawn Pearce has died

On Mon, Jan 29, 2018 at 2:55 PM, Christian Couder wrote: > On Mon, Jan 29, 2018 at 6:21 PM, Jeff King wrote: >> On Mon, Jan 29, 2018 at 10:33:08AM +0100, Johannes Schindelin wrote: >> >>> I found these sad news in my timeline today: >>> >>>

Re: Feature request: Improve diff algorithm

On Sat, Jan 27, 2018 at 5:08 AM, KES wrote: > One yet more: > > @@ -43,22 +44,25 @@ sub tariff_title { > 1; > > __DATA__ > -@@ control/tariff.css > -* { > -margin: 0; > -padding: 0; > -border: 0; > --webkit-box-sizing: border-box; > -box-sizing:

Re: [PATCH v2 1/1] setup: recognise extensions.objectFormat

On Tue, Jan 30, 2018 at 05:30:04PM +0100, Patryk Obara wrote: > > I don't have a strong opinion on this, but it does feel a little funny > > to add this extension now, before we quite know what the code that uses > > it is going to look like (or maybe we're farther along there than I > >

Re: [PATCH v2 1/1] setup: recognise extensions.objectFormat

On 30/01/2018 02:38, Jeff King wrote: On Sun, Jan 28, 2018 at 01:36:17AM +0100, Patryk Obara wrote: This extension selects which hashing algorithm from vtable should be used for reading and writing objects in the object store. At the moment supports only single value (sha-1). In case value

2.15.1 - merge with submodule output issue

Dear git, I use since few weeks now git 2.15.1. I did few trials but please find here my outputs. To reproduce: Use a top module git which include a submodule First step: from a work area, I changed selected version of submodule in master branch. Then git add + git commit + git push  A

Re: [PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

> On 30 Jan 2018, at 15:40, Torsten Bögershausen wrote: > > On Tue, Jan 30, 2018 at 12:23:47PM +0100, Lars Schneider wrote: >> >>> On 29 Jan 2018, at 21:19, tbo...@web.de wrote: >>> >>> From: Torsten Bögershausen >>> >>> UTF-16 encoded files are treated as

Re: Location limits on development, staging and production environments

On 01/29/2018 10:02 PM, Bryan Turner wrote: > On Mon, Jan 29, 2018 at 11:08 AM, H wrote: >> I am a newcomer to git looking to set up a web development environment where >> individual computers are used for development, the development.git, >> staging.git and

Re: [PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

On Tue, Jan 30, 2018 at 12:23:47PM +0100, Lars Schneider wrote: > > > On 29 Jan 2018, at 21:19, tbo...@web.de wrote: > > > > From: Torsten Bögershausen > > > > UTF-16 encoded files are treated as "binary" by Git, and no CRLF > > conversion is done. > > When the UTF-16 encoded

Re: Creating sparse checkout in a new linked git worktree

> On Wed, Jan 24, 2018 at 11:11 AM, Jessie Hernandez > wrote: >> I am trying to get a sparse checkout in a linked worktree but cannot get >> it working. I have tried the following >> * git worktree add /some/new/path/new-branch --no-checkout >> * git config

Re: [PATCH 0/2] Add "git rebase --show-patch"

Hi Duy, On Tue, 30 Jan 2018, Duy Nguyen wrote: > On Mon, Jan 29, 2018 at 10:09 PM, Johannes Schindelin > wrote: > > Hi Duy, > > > > On Fri, 26 Jan 2018, Nguyễn Thái Ngọc Duy wrote: > > > >> When a conflict happens during a rebase, you often need to look at the > >>

Re: Missing ? wildcard character in gitignore documentation

On Tue, Jan 30, 2018 at 6:07 PM, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Jan 30 2018, Duy Nguyen jotted: > >> On Mon, Jan 29, 2018 at 10:47:10AM -0500, Randall S. Becker wrote: >>> The implication of support for ? is there through the following paragraph >>> from the

Re: [PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

> On 29 Jan 2018, at 21:19, tbo...@web.de wrote: > > From: Torsten Bögershausen > > UTF-16 encoded files are treated as "binary" by Git, and no CRLF > conversion is done. > When the UTF-16 encoded files are converted into UF-8 using the new s/UF-8/UTF-8/ >

Re: [PATCH 2/2] rebase: add --show-patch

On 26/01/18 11:22, Duy Nguyen wrote: > On Fri, Jan 26, 2018 at 6:12 PM, Phillip Wood > wrote: >>> diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh >>> index 06a4723d4d..5c513a9736 100644 >>> --- a/git-rebase--merge.sh >>> +++ b/git-rebase--merge.sh >>> @@

Re: Missing ? wildcard character in gitignore documentation

On Tue, Jan 30 2018, Duy Nguyen jotted: > On Mon, Jan 29, 2018 at 10:47:10AM -0500, Randall S. Becker wrote: >> The implication of support for ? is there through the following paragraph >> from the gitignore documentation: >> >> "Otherwise, Git treats the pattern as a shell glob suitable

git stash ; git stash pop unstages all staged changes

Hi there, I just lost quite some work, because `git stash; git stash pop` doesn’t seem to understand the concept of the index correctly. To reproduce: — snip — dwt@crest ~/Desktop % mkdir test dwt@crest ~/Desktop % cd test dwt@crest ~/Desktop/test % git init Initialized empty Git repository in

Re: [PATCH v2 2/2] format-patch: reduce patch diffstat width to 72

On Sat, Jan 27, 2018 at 11:47 PM, Jeff King wrote: > On Thu, Jan 25, 2018 at 06:59:27PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh >> index 9f563db20a..1e62333b46 100755 >> --- a/t/t4052-stat-output.sh >> +++

Re: Missing ? wildcard character in gitignore documentation

On Mon, Jan 29, 2018 at 10:47:10AM -0500, Randall S. Becker wrote: > The implication of support for ? is there through the following paragraph > from the gitignore documentation: > > "Otherwise, Git treats the pattern as a shell glob suitable for > consumption by fnmatch(3) with the

Re: [PATCH 02/10] t5812: add 'test_i18ngrep's missing filename parameter

On Fri, Jan 26, 2018 at 01:37:00PM +0100, SZEDER Gábor wrote: > [snip] > > diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh > index d911afd24..226a4920c 100755 > --- a/t/t5812-proto-disable-http.sh > +++ b/t/t5812-proto-disable-http.sh > @@ -21,8 +21,7 @@

Re: [PATCH 0/2] Add "git rebase --show-patch"

On Mon, Jan 29, 2018 at 10:09 PM, Johannes Schindelin wrote: > Hi Duy, > > On Fri, 26 Jan 2018, Nguyễn Thái Ngọc Duy wrote: > >> When a conflict happens during a rebase, you often need to look at the >> original patch to see what the changes are. This requires opening

Re: [PATCH v2 02/10] sequencer: introduce new commands to reset the revision

On Mon, Jan 29, 2018 at 5:54 PM, Johannes Schindelin wrote: > [...] > This commit implements the commands to label, and to reset to, given > revisions. The syntax is: > > label > reset > [...] > > Signed-off-by: Johannes Schindelin

<    1   2