| > But git stash does keep track of what it added? Added as in staged > If your current changes apply to files which haven't changed between said branches, you don't need to stash your changes when switching between them. Yeah, I know. So why do I have to stash when I've changed an unrelated part of the same file? > The command for that is `git merge`. But that doesn't know which branch is upstream, I have to tell it explicitly each time. > The command for that is `git push origin HEAD`. I want "git push" to just do that. > The option for that is `--no-track`. Yeah, I know, but I wish I could just turn it off for when I forget, or when I'm doing it from an IDE or similar. |