Re: Git reset --hard with staged changes

2014-06-09 Thread Dale Worley
From: Pierre-François CLEMENT likeyn at gmail.com You create a new (untracked) file. You use git-reset's hard mode to go one commit back, the new (untracked) file's still there. You add/stage that new file. You use git-reset's hard mode again to go one commit back, and the new untracked file

Re: Bug: Failure if stdin is closed.

2013-07-11 Thread Dale Worley
From: Thomas Rast tr...@inf.ethz.ch May I ask why you need this, and to what extent this problem cannot be solved by instead redirecting from/to /dev/null? The situation in which the problem arose is described here: wor...@alum.mit.edu (Dale R. Worley) writes: (The original problem and

[PATCHv3] CodingGuidelines: Documentation/*.txt are the sources

2013-05-10 Thread Dale Worley
People not familiar with AsciiDoc may not realize they are supposed to update *.txt files and not *.html/*.1 files when preparing patches to the project. Signed-off-by: Dale Worley wor...@ariadne.com --- Documentation/CodingGuidelines |6 -- 1 files changed, 4 insertions(+), 2 deletions

Re: git rebase loses the additional changes in evil merges

2013-03-05 Thread Dale Worley
From: Junio C Hamano gits...@pobox.com I think this is to be expected for git rebase, as it does not even look at merges. It is a way to find non-merge commits that haven't been applied yet, and apply them to the upstream to create a new linear history. I disagree. git rebase is not