If you know the contents of the line, this is an ideal use case for: git log -S <string> path/to/file which shows you commits which introduce or remove an instance of that string. There’s also the -G<regex> which does the same thing with regular expressions! See man git-log and search for the -G and -S … Read more
That will almost work. When pushing to a non-default branch, you need to specify the source ref and the target ref: git push origin branch1:branch2 Or git push <remote> <branch with new changes>:<branch you are pushing to>
commits per author git shortlog -s -n
You can use git aliases, e.g. git config –global alias.add-commit ‘!git add -A && git commit’ and use it with git add-commit -m ‘My commit message’ EDIT: Reverted back to ticks (‘), as otherwise it will fail for shell expansion on Linux. On Windows, one should use double-quotes (“) instead (pointed out in the comments, … Read more
You have to use git clean -f -d to get rid of untracked files and directories in your working copy. You can add -x to also remove ignored files, more info on that in this excellent SO answer. If you need to reset an entire repository with submodules to the state on master, run this … Read more
origin is an alias on your system for a particular remote repository. It’s not actually a property of that repository. By doing git push origin branchname you’re saying to push to the origin repository. There’s no requirement to name the remote repository origin: in fact the same repository could have a different alias for another … Read more
I came across the same problem. To be precise, I have two branches A and B with the same files but a different programming interface in some files. Now the methods of file f, which is independent of the interface differences in the two branches, were changed in branch B, but the change is important … Read more
Since your files are not yet committed in branch1: git stash git checkout branch2 git stash pop or git stash git checkout branch2 git stash list # to check the various stash made in different branch git stash apply x # to select the right one Above is the longer more explicit version of rbento‘s … Read more
I ran into this issue with OSX. Original answer: It seems like a gpg update (of brew) changed to location of gpg to gpg1, you can change the binary where git looks up the gpg: git config –global gpg.program gpg1 If you don’t have gpg1: brew install gpg1. Updated answer: It looks like gpg1 is … Read more
First fetch the new master from the upstream repository, then rebase your work branch on that: git fetch origin # Updates origin/master git rebase origin/master # Rebases current branch onto origin/master Update: Please see Paul Draper’s answer for a more concise way to do the same – recent Git versions provide a simpler way to … Read more