From: Sylvain Rabot <sylvain@abstraction.fr>
To: git <git@vger.kernel.org>
Subject: Add new option in the right click menu in git gui
Date: Fri, 19 Feb 2010 00:11:57 +0100 [thread overview]
Message-ID: <7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com> (raw)
Hi,
In case of conflicts it is possible in git gui, through the right
click menu, to use local or remote versions, but, unless I missed
something, it is not possible, after using the merge tool, to add
merged files to the index.
It would be nice if we could add merged files in the index directly in git gui.
Besides, having this third option will avoid the mistake I used to
make when I was a git beginner, knowing, after using the merge tools I
was using the "use local version" options thinking it will add to the
index the local changes I just made to the conflicted file.
Regards.
--
Sylvain
next reply other threads:[~2010-02-18 23:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 23:11 Sylvain Rabot [this message]
2010-03-01 17:12 ` Add new option in the right click menu in git gui Heiko Voigt
2010-03-01 21:29 ` Sylvain Rabot
2010-03-01 21:45 ` Bert Wesarg
2010-03-26 13:53 ` Heiko Voigt
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=7fce93be1002181511v1c671f82u7f3d7cc6e3512bab@mail.gmail.com \
--to=sylvain@abstraction.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).