Tag: git

git: rebase over a rebased branch, stacked branches: 2024-10-21 git: how to rebase over a rebased branch, stacked branches
git: kdiff3 as difftool and mergetool: 2023-06-11 Git: How to configure Kdiff3 as a merge and conflict resolution tool.
git: update commit message: 2021-09-13 Git: Some ways to update the commit message
git: count commits by author: 2021-09-13 Git: How to show the number of commits by author
git: move files with history to another repository: 2021-09-13 Git: How to move files with history from one repository to another.
git: cherry-pick a range of commits: 2021-09-13 Git: How to cherry-pick a range of commits
Git Hook to Add Issue Number to Commit Message: 2019-06-16 How to add a git hook that automatically inserts the issue number into the commit message.
Simple Git Workflow: 2016-07-03 Git Workflows for the Team
git: how to revert multiple recent commits: 2014-01-04 How to revert multiple recent commits in a git repository
git: keep 'git log' and 'git diff' output on the screen: 2014-01-04 How to keep 'git log' and 'git diff' output on the screen after exit
git: self-hosted server setup: 2013-06-14 Git: How to set up a git server on Ubuntu with push email notifications.
git: find not merged branches: 2012-10-01 Git: how to find branches that have not been merged yet.
git: viewing changes using diff and log: 2012-10-01 Tips on using git diff and git log.
git: your branch is ahead of 'origin/master' by 1 commit after pull: 2012-09-30 What to do when git reports that your branch is ahead of master.
git: find all branches where a file was changed: 2012-09-30 How to find all branches where a specific file was changed.
git: submodule helpers: 2012-09-23 Git: useful commands to work with submodules
git: use vim with fugitive to resolve merge conflicts: 2012-04-24 Vim: how to use fugitive as a git merge tool
git: remove deleted files from git: 2012-04-03 Git: how to remove already deleted files from git control.
git: how to rename a branch (local and remote): 2012-04-03 How to rename a local or remote Git branch.
git: colored output (diff, branch, etc) by default: 2012-02-28 How to enable colors for git output.
git: your branch and 'origin/xxx' have diverged error: 2012-02-13 Reasons for branch to be diverged and solutions.
git: checkout and track remote branch: 2012-02-10 How to check out and track the remote branch.