Git
Git is an incredibly powerful tool that empowers teams to build amazing software together. However, we understand that Git's user experience can sometimes be a bit challenging and cause frustrations. Many developers have found themselves scratching their heads, struggling to grasp its intricacies.
Below is a sporadic sprinkling of material about Git.
Track diffs by scoping file, range, function, method, class changes
Discover the power of scoping change differentials in Git by focusing on specific files, line ranges, functions, methods, or classes. This article demonstrates various commands using the Ruby language …
Using three-way diffing context for merge conflict style in Git
It recently came to my attention that not everyone overrides the default merge.conflictStyle git-config setting. So in case anyone here wanted to try something new out that would provide more context …
Distributed Developer Workflows using Git
This meetup I will be walking the audience through how to setup, configure and maintain distributed development workflows using Git (the distributed VCS developers either love or hate). Much of the …
My .gitconfig & .tigrc files
This started as my first ~/.gitconfig file and is probably out of date when you read it. [user] name = Susan Potter # make sure you change this email = me@susanpotter.net # make sure you change this …
SCM: The Next Generation
Have you heard of Darcs or Git? Many developers are familiar with traditional version control systems like Subversion and CVS, but the next generation of source control management will be distributed …
How can I show only the files containing merge conflicts?
To show only the files containing merge conflicts in Git, you can use the git diff command with the --name-only and --diff-filter options. Here's the command you can use: git diff --name-only …
How do I delete a branch in Git locally and globally?
To delete a Git branch locally and then remotely, you can follow these steps: Delete the local branch using the git branch command with the -d option: git branch -d <branch_name> This will …
How to show the current branch name?
To know what branch you are currently on in Git, you can use the git branch command. When you run this command without any options, Git will show you a list of all the branches in your repository and …