In terms of source control, you’re downstream when you copy (clone, checkout, etc) from a repository. Information flowed “downstream” to you. When you make changes, you usually want to send them back “upstream” so they make it into that repository so that everyone pulling from the same source is working with all the same changes. … Read more
The error message error: refusing to update checked out branch: refs/heads/master is emitted by the remote repository and it means you’re trying to push code to remote non-bare repository that has different code currently checked out in the working directory. The best way to avoid this problem is to push to bare repositories only – … Read more
TL;DR A git rebase workflow does not protect you from people who are bad at conflict resolution or people who are used to a SVN workflow, like suggested in Avoiding Git Disasters: A Gory Story. It only makes conflict resolution more tedious for them and makes it harder to recover from bad conflict resolution. Instead, … Read more
Use git log –graph or gitk. (Both also accept –all, which will show all the branches instead of just the current one.) For branch names and a compact view, try: git log –graph –decorate –oneline
The –follow works for a particular file git log –follow — filename Difference to other solutions given Note that other solutions include git log path (without the –follow). That approach is handy if you want to track e.g. changes in a directory, but stumbles when files were renamed (thus use –follow filename).
Git can search diffs with the -S option (it’s called pickaxe in the docs) git log -S password This will find any commit that added or removed the string password. Here a few options: -p: will show the diffs. If you provide a file (-p file), it will generate a patch for you. -G: looks … Read more
Use git cherry-pick <commit> to apply <commit> to your current branch. I myself would probably cross-check the commits I pick in gitk and cherry-pick them with right-clicks on the commit entry there instead. If you want to go more automatic (with all its dangers) and assuming all commits since yesterday happened on wss you could … Read more
When you modify a file in your repository, the change is initially unstaged. In order to commit it, you must stage it—that is, add it to the index—using git add. When you make a commit, the changes that are committed are those that have been added to the index. git reset changes, at minimum, where … Read more
A similar alternative is the –strategy-option (short form -X) option, which accepts theirs. For example: git checkout branchA git merge -X theirs branchB However, this is more equivalent to -X ours than -s ours. The key difference being that -X performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s ours … Read more
Try deleting index.lock file in your .git directory or in one of your worktrees .git/worktrees/*/index.lock if you are in a worktree. rm -f .git/index.lock Such problems generally occur when you execute two git commands simultaneously; maybe one from the command prompt and one from an IDE.