It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Manually align diff lines for staging/unstaging parts of a file.

In SourceTree, when highlighting a changed file in preparation for a commit, there is a diff displayed in a neighboring pane. In that pane I can stage individual hunks or even individual lines.

However, sometimes the diff engine does a poor job of aligning changes between the last commit and the working directory. So if I attempt to stage/unstage specific lines, they may end up in the wrong place.

Is there a way to set a better diff algorithm?

Regardless of the algorithm, is there a way to manually set which lines correspond to each other, so the diff is more accurate - and allows me to safely separate two (or more) changes into separate commits?

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Agile

Webinar: Dean Leffingwell and Steve Elliot present on SAFe 5.0, come ask Dean and Steve questions!

...steemed Steve Elliot (head of product for Jira Align). Agenda: What’s new or changed in SAFe 5.0: Introduction of OKRs Essential SAFe How to achieve true business a...

152 views 0 1
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you