Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 1068 hybrid poshold #1097

Merged
merged 3 commits into from
Sep 26, 2014

Conversation

squilter
Copy link
Member

Close #1068

m4gr3d added a commit that referenced this pull request Sep 26, 2014
@m4gr3d m4gr3d merged commit e8b407d into DroidPlanner:master Sep 26, 2014
@squilter squilter deleted the issue_1068_hybrid_poshold branch September 26, 2014 22:26
@arthurbenemann
Copy link
Member

@squilter Nice jop on renaming the '''ModePosHoldFragment''' fragment without messing up the git history

@squilter
Copy link
Member Author

I can't tell if I actually did it right, or if git is just smarter than a few months ago.

@arthurbenemann
Copy link
Member

@squilter It seams that git just got it right this time. If there is only a small amount of changes it figures out the moved files. But a better procedure is to keep the rename and file alterations in different commits, and even more important if you want to keep the tools like blame working.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants