Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Does TortoiseGit allow selective staging, like git-gui?

This question:

Can you interact with the index/staging area with TortoiseGit?

takes the position that TortoiseGit's main function is not to eliminate the need for the git command line, and in general, I agree.

However, git-gui has a feature I use a lot (maybe to compensate for bad workflow): the ability to selectively stage or unstage hunks or lines from the current patch in order to split a bunch of interspersed changes into coherent changesets in multiple commits.

The command-line alternative (for me, at any rate) is a bit clunky, so, ideally, I'd like to do the same selective committing in TortoiseGit.

So far I haven't found a way to do this, and I suspect, from the answer to the other question, that it isn't possible. Can anyone confirm this, please?

like image 329
Brent.Longborough Avatar asked Aug 07 '11 09:08

Brent.Longborough


People also ask

What is the difference between TortoiseGit and Git?

TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files over time. Files are stored in a local repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories.

Does TortoiseGit include Git?

One prerequisite of TortoiseGit is that it requires an already installed (command line) Git client which provides a git.exe . Git for Windows is recommended (Cygwin and MSYS2 Git also work, see the section called “General Settings” for configuration.

What is diff in TortoiseGit?

Difference between files. If you want to see the differences between two different files, you can do that directly in explorer by selecting both files (using the usual Ctrl-modifier). Then from the explorer context menu select TortoiseGit → Diff.

What is Git bash and TortoiseGit?

TortoiseGit is a graphical UI for Git in Windows. TortoiseGit is unique because the primary way to interact with it is through the Windows Explorer context menu. To work with TortoiseGit, you have to have a Windows Explorer open to the current working directory and then two mouse clicks away from most functions.


2 Answers

Yes it does now: see issue 222 - it takes the same approach as TortoiseSVN where you:

  • right-click on file, choose "Restore after commit"
  • TSVN creates a copy of the file outside the working copy, the file is shown differently in > the commit dialog (maybe an overlay icon or a different color)
  • user can double-click the file to open it in TMerge or some other diff tool and undo all the changes that should not be committed, then save those changes
  • commit
  • after the commit is finished, the copy of the original file is moved back

(From TSVN Issue 68)

like image 119
Duncan Smart Avatar answered Sep 21 '22 01:09

Duncan Smart


The only client on windows that has full support for selective staging in the GUI I've seen so far is SmartGit.

Thus said it has weak sides too, comparing to TortoiseGit or GitExtensions.

For me, main showstoppers in SmartGit are:

  1. Inability to compare two revisions. You could only see diff between one and its parent (TortoiseGit can that).
  2. Inability (well, it is somewhat strange, it is possible I didn't found the way) to limit log to some folder if I don't interested in everything (TortoiseGit can).
  3. Integration with VisualStudio (somewhat subjective, but GitEx have it and it is very handy)

I remember that there was something else, but evaluating last version of SmartGit now I can't find it. Either it was fixed/added or I just forgot what thing I can't do that time.

In any case I'm using both GitEx and TortoiseGit for some things and for everything else console is the best tool.

like image 22
Ivan Danilov Avatar answered Sep 21 '22 01:09

Ivan Danilov