Skip to content

Latest commit

 

History

History
executable file
·
171 lines (97 loc) · 4.3 KB

README.md

File metadata and controls

executable file
·
171 lines (97 loc) · 4.3 KB
Raw

Git » gitconfig files

Git configuration files.

This has git aliases, branches, merges, syntax coloring, merges, credentials, and more.

See the file gitconfig.txt.

Install

Install for novice users:

  1. See the file gitconfig.txt

  2. You can copy/paste anything that you like into your own .gitconfig file.

Install for intermediate users:

  1. Get these files:

    git clone https://github.com/SixArm/gitconfig.git

  2. Create your own personal .gitconfig file, or edit your existing file, such as:

    edit ~/.gitconfig

  3. Add these lines:

    [include] path = gitconfg.txt

Install for specific operating systems:

  1. If your system is OSX, and you want to enable the keychain credential manager, then add this:

    [include] path = gitconfig-specific-to-osx.txt

  2. If your system is Windows, and you want to enable the system credential manager, then add this:

    [include] path = gitconfig-specific-to-windows.txt

User personalization

If you use the user.txt file, you will want to personalize it:

[user]
  email = alice@example.com
  name = Alice Anderson

GitHub personalization

If you use GitHub and the github.txt file, you will want to personalize it:

[github]
  user = alice
  token = alice-token

Customization

Git makes it easy to do customization of someone else's file:

[include]
   path = ~/someone-elses-file.txt

[alias]
   l = log --graph --oneline

Format

To use better pretty formatting:

[format]
  pretty = "%H %ci %ce %ae %d %s"

Status

If you like terse status messages:

[alias]
  s = status -sb

Log

If you like log summaries:

[alias]
  l = log --graph --oneline

Meld merge tool

We like using the meld mergetool because it is powerful and can use three windows for comparisons.

This repo includes a script for running meld with three windows.

To use meld with three windows, put the script on your path, for example:

cp bin/meld-with-three-windows /usr/local/bin

Most pager

If you prefer using most as a pager:

[core]
  pager = most

To get most, do brew install most on OSX, or apt-get install most on Ubuntu, etc.

Suggestion for branch auto setup merge

We tell git-branch and git-checkout to setup new branches so that git-pull will appropriately merge from that remote branch.

git config --global branch.autosetupmerge true

If we didn't do this, we would have to add --track to our branch command or manually merge remote tracking branches with "fetch" and then "merge".

Suggestion for tab completion

To install git tab completion, we go to the git source code directory then run:

echo "source ./contrib/completion/git-completion.bash" >> /etc/bash.bashrc

Suggestion for git GUI apps

Read http://git.or.cz/gitwiki/InterfacesFrontendsAndTools

Our favorite open source free GUI for Ubuntu is http://cola.tuxfamily.org/

More

For more git config ideas, and for credit for many of the aliases here, please see these excelent resources:

Thanks