// The toolbar relies on a measure + layout pass happening after it calls requestLayout(). // Without this, certain calls (e.g. setLogo) only take effect after a second invalidation. post(mLayoutRunnable); }
git branch -m old_branch new_branch # Rename branch locally git push origin :old_branch # Delete the old branch git push --set-upstream origin new_branch # Push the new branch, set local branch to track the new remote
All commits from this branch will be added to the base branch via a merge commit. 创建一个专门用于合并的commit,保留原始的commit id.
2.2 Squash and merge
The 1 commit from this branch will be added to the base branch. 创建一个commit,包含所有的changes,但是commit id丢失了。
2.3 Rebase and merge
The 1 commit from this branch will be rebased and added to the base branch. 这里的1 commit我不是很理解,其实是整体一组commits。它们的修改时间(Date)没有变化,但是提交时间(commite Date)时间统一变为rebase命令的执行时间。 重新Rebase对象的分支,然后所有的commit id和commit Date变了,changes,commit message,Date没变。