ATTENTION: You are viewing a page formatted for mobile devices; to view the full web page, click HERE.

Main Area and Open Discussion > General Software Discussion

DVCS ? (All about Git, Mercurial-Hg and the like...)

<< < (28/39) > >>

Armando:
Seems nice. Thanks Jibz.

ewemoa:
After a botched interactive rebase session, learned about the "Lost Heads" functionality of the Log window in SmartGitHg.  (Apparently, something similar was possible before via Query | Load All Commits, but this functionality seems to have been removed in the 4.x series.)

IIUC, checking the checkbox next to "Lost Heads" in the "Branches" tab of the Log window leads to showing the content of the reflog in the "Commits" tab.

Once such commits can be seen, recovery was farily straight-forward.:


* In the "Commits" tab, select the commit representing the state to "get back" to.
* Create a new branch via "Add Branch...".
* Point the original branch (e.g. master, if that's what was involved with the interactive rebase) at the newly created branch.

The Lost Heads will show all commit heads which are not accessible from a tag or branch.

--- End quote ---

via:
  http://www.syntevo.com/smartgithg/tour.html

ewemoa:
As a side note, I've disabled Preferences -> Commands -> Clean Up -> Periodically invoke Git's garbage collection when idle.

May be that makes it a bit easier to recover from my own errors...

ewemoa:
May be tagging the most recent commit before going through an interactive rebase is cheap way to make reverting easy (and upon success, deleting the tag)...

ewemoa:
SmartGit/Hg 4.5 was released recently.

Some interesting parts include:


* Syntax coloring in some of the code viewing windows
* Staging hunks from within the Changes tool window (haven't tested)
* Additional polishing of Blame interface (tested a little)
via:

  What's New in SmartGit/Hg 4.5

Navigation

[0] Message Index

[#] Next page

[*] Previous page

Go to full version