Re: What's cooking in git.git (Dec 2017, #05; Wed, 27)

2018-01-03 Thread Daniel Knittl-Frank
On Wed, Dec 27, 2017 at 10:34 PM, Junio C Hamano wrote: > * dk/describe-all-output-fix (2017-12-27) 1 commit > - describe: prepend "tags/" when describing tags with embedded name > > An old regression in "git describe --all $annotated_tag^0" has been > fixed. > > Will merge to 'next'. Shouldn

[RFC] Prepend "tags/" when describing tags with embedded name

2017-12-23 Thread Daniel Knittl-Frank
On Fri, Dec 15, 2017 at 8:25 PM, Junio C Hamano wrote: > I think the code makes sense, but it won't be understandable by > those who do not know what you discussed in the original thread. > > A proper commit log message, with a new test or two in t6120, would > be an appropriate way to fix that. >

Re: "git describe" documentation and behavior mismatch

2017-12-11 Thread Daniel Knittl-Frank
Forget the above patch. I should compile my code after refactoring ... Here is the fixed version. -- >8 -- >From 8203bd0ad5baab7024ebff597c9f35a0250d09ff Mon Sep 17 00:00:00 2001 From: Daniel Knittl-Frank Date: Mon, 11 Dec 2017 19:24:54 +0100 Subject: [PATCH] Prepend "tags/"

Re: "git describe" documentation and behavior mismatch

2017-12-11 Thread Daniel Knittl-Frank
the output with "tags/". Good enough? Should we instead update the documentation? Still not sure, what the behavior _should_ be in the case of annotated tags with embedded names. -- >8 -- >From 7243d700aad280b11e647e04ade027c412dde54c Mon Sep 17 00:00:00 2001 From: Daniel Knittl-Frank

Re: "git describe" documentation and behavior mismatch

2017-11-30 Thread Daniel Knittl-Frank
On Thu, Nov 30, 2017 at 7:47 PM, Daniel Knittl-Frank wrote: > […] > > Running the above commands in the git.git repository yields a different > result: > >> $ git describe --all --abbrev=4 v1.0.5^2 >> v1.0.0-21-g975b3 > > No "reference path" t

"git describe" documentation and behavior mismatch

2017-11-30 Thread Daniel Knittl-Frank
Hi Git list, the help page/manpage of the git describe command has an example with the --all flag which should prepend the ref namespace (tags/ or heads/): > With --all, the command can use branch heads as references, so the output > shows the reference path as well: > > [torvalds@g5 gi

[PATCH] Escape Git's exec path in contrib/rerere-train.sh script

2015-11-08 Thread Daniel Knittl-Frank
Whitespace can cause the source command to fail. This is usually not a problem on Unix systems, but on Windows Git is likely to be installed under "C:/Program Files/", thus rendering the script broken. Signed-off-by: Daniel Knittl-Frank --- contrib/rerere-train.sh | 2 +- 1 file

Re: How to prevent empty git commit --amend

2015-01-13 Thread Daniel Knittl-Frank
On Tue, Jan 13, 2015 at 9:56 AM, Ivo Anjo wrote: > Hello, > > I sometimes get a bit distracted when making amends. Once or twice per > week I do a commit, then realize I added something I shouldn't, or > forgot to add a line here or there, and then I do a git commit --amend > to fix it. > > The th

Re: Possible git bug

2013-08-13 Thread Daniel Knittl-Frank
On Wed, Aug 14, 2013 at 6:50 AM, Hugh Davenport wrote: > Hey, > > Not sure if this is a bug or not. I commonly am finding myself wanting to > remove some recent commits, either all or just a select few. So I use rebase > in interactive mode for this. The problem I find is that when I do a rebase >

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread knittl
Sharing my thoughts on this one, … On Sun, Sep 23, 2012 at 5:04 PM, Ralf Thielow wrote: > On Sat, Sep 22, 2012 at 11:57 PM, Sascha Cunz wrote: >> However, git-rebase just threw these two sentences at me (And though i know >> their meaning, i couldn't get the meaning from the message, it gave).