Re: [PATCH v2 try2 00/14] Officially start moving to the term 'staging area'

On 25 April 2014 11:12, Felipe Contreras felipe.contre...@gmail.com wrote: It has been discussed many times in the past that 'index' is not an appropriate description for what the high-level user does with it, and it has been agreed that 'staging area' is the best term. The term 'staging

[PATCH] init - Honour the global core.filemode setting

If ~/.gitconfig contains a core.filemode entry then git init should honour that setting. Signed-off-by: Hilco Wijbenga hilco.wijbe...@gmail.com --- This bit me at work where I have to work with Windows. Git on Cygwin and the Eclipse Git plugin do not agree on file attributes so I had set filemode

Re: [PATCH] init - Honour the global core.filemode setting

Hi Torsten, Thank you for taking the time to review my patch. On 28 September 2014 04:52, Torsten Bögershausen tbo...@web.de wrote: On 2014-09-28 02.37, Hilco Wijbenga wrote: If ~/.gitconfig contains a core.filemode entry then git init should honour that setting. Signed-off-by: Hilco

Flatten history

Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now like to get all the changes from feature but not any of the commits. Basically, I want to replay all of feature's commits without creating those commits. I

Re: Flatten history

On 29 July 2013 20:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now

Re: Flatten history

On 29 July 2013 20:59, Bryan Turner btur...@atlassian.com wrote: On 30 July 2013 13:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date

Re: Officially start moving to the term 'staging area'

On 6 September 2013 08:45, Ping Yin pkufra...@gmail.com wrote: On Wed, Sep 4, 2013 at 2:08 PM, William Swanson swanson...@gmail.com wrote: On Thu, Aug 29, 2013 at 11:01 AM, Felipe Contreras felipe.contre...@gmail.com wrote: It has been discussed many times in the past that 'index' is not an

Re: [Proposal] Clonable scripts

On 9 September 2013 13:48, Niels Basjes ni...@basjes.nl wrote: If those scripts were how ever written in a language that is build into the git program and the script are run in such a way that they can only interact with the files in the local git (and _nothing_ outside of that) this would be

Your branch and 'origin/master' have diverged

Hi all, A colleague of mine (after a relatively long absence) noticed the following when running git status: # On branch master # Your branch and 'origin/master' have diverged, # and have 250 and 19 different commit(s) each, respectively. # nothing to commit (working directory clean) He asked

Re: Your branch and 'origin/master' have diverged

On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: # On branch master # Your branch and 'origin/master' have diverged, # and have 250 and 19 different commit(s) each, respectively. # nothing to commit (working directory clean

Re: Your branch and 'origin/master' have diverged

On 14 August 2012 09:02, PJ Weisberg p...@irregularexpressions.net wrote: On Mon, Aug 13, 2012 at 12:58 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, A colleague of mine (after a relatively long absence) noticed the following when running git status: # On branch master # Your

Re: Your branch and 'origin/master' have diverged

On 14 August 2012 10:19, Junio C Hamano gits...@pobox.com wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: # On branch master # Your branch and 'origin/master' have

Re: Your branch and 'origin/master' have diverged

On 14 August 2012 13:12, Thomas Rast tr...@student.ethz.ch wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: On 14 August 2012 10:19, Junio C Hamano gits...@pobox.com wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote

Re: a small git proposal

On 23 August 2012 08:10, Catalin Pol catalin@gmail.com wrote: Hi everyone, This is my first email to this mailing list, so this may be somehow too straight forward... the idea is that I was thinking to develop a new feature in Git (although I'm kind of new to git myself). I wrote a small

Re: /* in .gitignore

On 25 September 2012 16:13, Junio C Hamano gits...@pobox.com wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: Naturally, this behaviour makes perfect sense: /* means everything. Still, I was wondering whether it might be a good idea to make an exception for '.gitignore' itself

Re: New feature discussion: git rebase --status

On 11 June 2013 06:19, Matthieu Moy matthieu@grenoble-inp.fr wrote: John Keeping j...@keeping.me.uk writes: The one piece of information that I often want is the SHA1 of the commit that is currently being applied. Currently I have to look through my scrollback for the stopping message or

Re: [Request] Git reset should be able to ignore file permissions

On 19 June 2013 01:00, Alexander Nestorov alexander...@gmail.com wrote: Ok, this is how it looks. If everything is ok, I'm sending it to the ML From 262bdfb5cc84fec7c9b74dc92bb604f9d168ef9a Mon Sep 17 00:00:00 2001 From: Alexander Nestorov alexander...@gmail.com Date: Wed, 19 Jun 2013

Re: git send-email should not allow 'y' for in-reply-to

On 11 January 2013 08:47, Jeff King p...@peff.net wrote: On Fri, Jan 11, 2013 at 09:39:06AM -0700, Eric Blake wrote: Please don't answer y when git send email shows the following prompt: Message-ID to be used as In-Reply-To for the first email? you should respond with a message ID

On using receive.denyNonFastForwards and advice.pushNonFastForward

Hi all, I was wondering how hard it would be to make git push more adamant about not pushing non-ff updates. So I wanted to see the effects of receive.denyNonFastForwards and advice.pushNonFastForward. (By the way, why is one plural and the other singular? That doesn't seem consistent?)

Re: Git's inconsistent command line options

On 25 August 2015 at 16:43, Junio C Hamano gits...@pobox.com wrote: I do not see a good way to do such a safe transition with command words approach, *unless* we are going to introduce new commands, i.e. git list-tag, git create-tag, etc. Perhaps we could introduce a more explicit notion (in

Re: How to use git show's "%<([,trunc|ltrunc|mtrunc])"?

On 3 February 2017 at 00:06, Duy Nguyen <pclo...@gmail.com> wrote: > On Fri, Feb 3, 2017 at 12:51 AM, Hilco Wijbenga > <hilco.wijbe...@gmail.com> wrote: >> Hi all, >> >> I'm trying to get the committer date printed in a custom fashion. >> Using "%cI

Re: How to use git show's "%<([,trunc|ltrunc|mtrunc])"?

On 2 February 2017 at 20:19, G. Sylvie Davies <syl...@bit-booster.com> wrote: > On Thu, Feb 2, 2017 at 9:51 AM, Hilco Wijbenga <hilco.wijbe...@gmail.com> > wrote: >> Hi all, >> >> I'm trying to get the committer date printed in a custom fashion. >> U

How to use git show's "%<([,trunc|ltrunc|mtrunc])"?

Hi all, I'm trying to get the committer date printed in a custom fashion. Using "%cI" gets me close: $ git show --format="%cI | %an" master | head -n 1 2017-01-31T17:02:13-08:00 | Hilco Wijbenga I would like to get rid of the "-08:00" bit at the end of the timesta

Re: Force Confirmation for Dropping Changed Lines

On 25 January 2017 at 18:32, Junio C Hamano wrote: > I think you should be able to do something like > > $ cat >$HOME/bin/fail-3way <<\EOF > #!/bin/sh > git merge-file "$@" > exit 1 > EOF > $ chmod +x $HOME/bin/fail-3way >

Re: Force Confirmation for Dropping Changed Lines

On 25 January 2017 at 14:24, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Wed, Jan 25, 2017 at 2:16 PM, Hilco Wijbenga > <hilco.wijbe...@gmail.com> wrote: >> How can I force Git to not assume my change to the first line is "redundant"? >> > > My

Force Confirmation for Dropping Changed Lines

Hi all, Most of the time, when a later commit changes a line in an identical fashion during, say, a rebase, you want Git to silently continue by dropping the duplicate change from the later commit. I have a common (for me) scenario where I want Git to specifically ask me to resolve this

Re: Force Confirmation for Dropping Changed Lines

On 25 January 2017 at 15:46, Junio C Hamano wrote: > Jacob Keller writes: > >>> Mmm, that sounds complex. The "my-code.x" is made up so I could keep >>> my example as simple as possible. In reality, it's Maven's POM files >>> (pom.xml). >>> >>> So there

Re: Git bisect does not find commit introducing the bug

On 18 February 2017 at 10:36, Alex Hoffman wrote: > You definitely convinced me that git MUST search more than only in the > paths between good and bad commits, as the good commit G does not have > to be the first good commit (thank you for that). My problem/confusion > is that it

There are too many unreachable loose objects

Hi all, Whenever I run "git push --force(-with-lease)" I get a variation of Counting objects: 187, done. Delta compression using up to 12 threads. Compressing objects: 100% (126/126), done. Writing objects: 100% (187/187), 21.35 KiB | 0 bytes/s, done. Total 187 (delta 78), reused 71 (delta 20)

Re: Is there any way to "interrupt" a rebase?

On Mon, Feb 19, 2018 at 2:36 PM, brian m. carlson <sand...@crustytoothpaste.net> wrote: > On Mon, Feb 19, 2018 at 11:35:25AM -0800, Hilco Wijbenga wrote: >> So a scenario like this: >> >> my-branch : X -> A -> B -> C -> D -> E -> F -> G >> ba

Re: Git should preserve modification times at least on request

On Mon, Feb 19, 2018 at 2:37 PM, Randall S. Becker wrote: > On February 19, 2018 4:58 PM Johannes wrote: >> On Mon, 19 Feb 2018, Peter Backes wrote: >> >> > please ensure to CC me if you reply as I am not subscribed to the list. >> > >> >

Re: Git should preserve modification times at least on request

On Mon, Feb 19, 2018 at 3:22 PM, Hilco Wijbenga <hilco.wijbe...@gmail.com> wrote: > Aside from exactly which modification times should be used (which I > would love to have a bit more control over as well), something else > I'd like to see is that, when switching between

Is there any way to "interrupt" a rebase?

Hi all, When maintaining a long running branch, I regularly rebase onto our active development branch so that my branch stays up-to-date. What happens fairly often is that during such a rebase, Git will exit because of rebase/merge conflicts. Nothing unexpected there, of course, but as it

Re: [PATCH v2 0/4] fix "rebase -i --root" corrupting root commit

Hi Eric, On Tue, Jul 31, 2018 at 12:33 AM, Eric Sunshine wrote: > This is a re-roll of [1] which fixes sequencer bugs resulting in commit > object corruption when "rebase -i --root" swaps in a new commit as root. > Unfortunately, those bugs made it into v2.18.0 and have already > corrupted at

Re: [PATCH v2 0/4] fix "rebase -i --root" corrupting root commit

On Tue, Jul 31, 2018 at 11:22 PM, Eric Sunshine wrote: > On Tue, Jul 31, 2018 at 9:30 PM Hilco Wijbenga > wrote: >> On Tue, Jul 31, 2018 at 12:33 AM, Eric Sunshine >> wrote: >> > This is a re-roll of [1] which fixes sequencer bugs resulting in commit >> &g

Re: Opinions on changing add/add conflict resolution?

On Mon, Mar 12, 2018 at 2:35 PM, Jonathan Nieder wrote: > Interesting. I would be tempted to resolve this inconsistency the > other way: by doing a half-hearted two-way merge (e.g. by picking one > of the two versions of the colliding file) and marking the path as >