From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: Re: [PATCH 1/2] read-tree: further loosen "working file will be lost" check.
Date: Tue, 05 Dec 2006 02:21:50 +0100 [thread overview]
Message-ID: <el2hfe$oi0$2@sea.gmane.org> (raw)
In-Reply-To: 7vlklnkv39.fsf@assigned-by-dhcp.cox.net
Junio C Hamano wrote:
> A new option "--ignore=.gitignore" can be used to tell the
> "git-read-tree" command that the user does not mind losing
> contents in untracked files in the working tree if it needs to
> be overwritten by a merge (either a two-way "switch branch"
> merge, or a three-way merge).
[...]
> builtin-read-tree.c | 20 ++++++++++
> dir.c | 4 +-
> dir.h | 3 ++
> t/t1004-read-tree-m-u-wf.sh | 82 ++++++++++++++++++++++++++++++++++++++----
> unpack-trees.c | 24 ++++++++++---
> unpack-trees.h | 1 +
> 6 files changed, 119 insertions(+), 15 deletions(-)
Documentation, please?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
prev parent reply other threads:[~2006-12-05 1:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-05 1:08 [PATCH 1/2] read-tree: further loosen "working file will be lost" check Junio C Hamano
2006-12-05 1:21 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='el2hfe$oi0$2@sea.gmane.org' \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox