query: Combining multiple commits before pushing in Git
positive_passages.docid: 25070
positive_passages.text: Squash my last X commits together using Git
negative_passages.docid: 74449
negative_passages.text: How can I selectively merge or pick changes from another branch in Git?
negative_passages.docid: 68159
negative_passages.text: Is there a way to make Git mark a file as conflicted?
negative_passages.docid: 50648
negative_passages.text: Default behavior of "git push" without a branch specified
negative_passages.docid: 36360
negative_passages.text: Resolving a Git conflict with binary files
negative_passages.docid: 16196
negative_passages.text: How to resolve merge conflicts in Git repository?
negative_passages.docid: 158455
negative_passages.text: git, how to reference last commit in current branch
negative_passages.docid: 153352
negative_passages.text: What's the simplest way to list conflicted files in Git?
negative_passages.docid: 14886
negative_passages.text: Delete commits from a branch in Git
negative_passages.docid: 112173
negative_passages.text: When would you use the different git merge strategies?
negative_passages.docid: 146835
negative_passages.text: Can a git submodule be created retroactively?
negative_passages.docid: 16500
negative_passages.text: How do you merge two Git repositories?
negative_passages.docid: 16239
negative_passages.text: How do I make a Git commit in the past?
negative_passages.docid: 12943
negative_passages.text: How to discard local commits in Git?
negative_passages.docid: 106620
negative_passages.text: Git is automatically merging changes from a different branch to master
negative_passages.docid: 53060
negative_passages.text: How can I generate a Git patch for a specific commit?
negative_passages.docid: 134890
negative_passages.text: How to diff a commit with its parent?