Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

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
TAGS
Community showcase
Published in DevOps

Step up your DevOps game webinar Q&A series - Questions answered!

  On October 21st, 2020 we hosted a webinar titled,   Step Up You DevOps Game with 4 Key Integrations for Jira and Bitbucket. We had a great showing and high engagement, but that meant th...

117 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