Ecosyste.ms: Awesome

An open API service indexing awesome lists of open source software.

Awesome Lists | Featured Topics | Projects

https://github.com/hugooliveirad/git-useful

Incredibly useful git commands
https://github.com/hugooliveirad/git-useful

Last synced: about 2 months ago
JSON representation

Incredibly useful git commands

Host: GitHub
URL: https://github.com/hugooliveirad/git-useful
Owner: hugooliveirad
Created: 2014-06-18T14:33:10.000Z (over 10 years ago)
Default Branch: master
Last Pushed: 2018-08-07T08:26:55.000Z (about 6 years ago)
Last Synced: 2024-07-05T14:53:34.288Z (3 months ago)
Size: 7.81 KB
Stars: 48
Watchers: 1
Forks: 3
Open Issues: 0
Metadata Files:
- Readme: README.md

Awesome Lists containing this project

README

# git-useful
> a collection of incredibly useful git commands

## Table of Contents
- [Add](#add)
- [add files interactively](#add-files-interactively)
- [add all changes ignoring whitespace changes](#add-all-changes-ignoring-whitespace-changes)
- [Log](#log)
- [shows commit frequency for each user in the repo](#shows-commit-frequency-for-each-user-in-the-repo)
- [pretty log (one line with graphic and colors)](#pretty-log-one-line-with-graphic-and-colors)
- [logs commits that added or removed a certain keyword](#logs-commits-that-added-or-removed-a-certain-keyword)
- [lists already-merged branches](#lists-already-merged-branches)
- [list authors by commits](#list-authors-by-commits)
- [list tags by date](#list-tags-by-date)
- [Diff](#diff)
- [diff word-by-word](#diff-word-by-word)
- [short infos about changes in a commit](#short-infos-about-changes-in-a-commit)
- [show changed files in a commit](#show-changed-files-in-a-commit)
- [list every changed file between two commits](#list-every-changed-file-between-two-commits)
- [show modifications in a file in a commit](#show-modifications-in-a-file-in-a-commit)
- [show files with conflicts](#show-files-with-conflicts)
- [Branch](#branch)
- [deletes already-merged branches](#deletes-already-merged-branches)
- [add new branch and switches to this branch](#add-new-branch-and-switches-to-this-branch)
- [Misc](#misc)
- [sync fork](#sync-fork)
- [assume file as unchanged](#assume-file-as-unchanged)
- [undo assume file as unchanged](#undo-assume-file-as-unchanged)
- [list files assumed as unchanged](#list-files-assumed-as-unchanged)
- [Clean](#clean)
- [remove untracked files](#remove-untracked-files)
- [Auditing](#auditing)

- [Others](#others)

## Add

#### add files interactively
```bash
git add --patch

# working example
git add . --patch
```
Very useful when you need to commit different lines of a file. See more at the docs for [Interactive Mode](http://git-scm.com/docs/git-add#_interactive_mode).

#### add all changes ignoring whitespace changes
```bash
git diff -w --no-color | git apply --cached --ignore-whitespace
```
That time when your editor removed all trailing spaces

source: http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes

## Log

#### shows commit frequency for each user in the repo
```bash
git log --format='%an' . | \
sort | uniq -c | sort -rn | head
```
source: http://mislav.uniqpath.com/2014/02/hidden-documentation/

#### pretty log (one line with graphic and colors)
```bash
git log \
--graph \
--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
```

#### logs commits that added or removed a certain keyword
```bash
git log -S ''
```
source: http://mislav.uniqpath.com/2014/02/hidden-documentation/

### lists already-merged branches
```bash
git branch --merged []

# working examples
git branch --merged master

# in the current HEAD
git branch --merged
```

source: http://stevenharman.net/git-clean-delete-already-merged-branches

#### list authors by commits
```bash
git shortlog -sn

# working example
git shortlog -sn master
```

source: http://codeinthehole.com/writing/command-line-tips-for-effective-release-announcements/

#### list commits by authors between revisions
```bash
git shortlog .. --no-merges

# working example
git shortlog master..HEAD --no-merges
```

source: http://codeinthehole.com/writing/command-line-tips-for-effective-release-announcements/

#### list tags by date
```bash
git for-each-ref --sort=taggerdate --format '%(refname) %(taggerdate)' refs/tags
```

source: http://stackoverflow.com/questions/6269927/how-can-i-list-all-tags-in-my-git-repository-by-the-date-they-were-created

## Diff

#### diff word-by-word
```bash
git diff --word-diff
```

source: http://idnotfound.wordpress.com/2009/05/09/word-by-word-diffs-in-git/

#### short infos about changes in a commit
```bash
git diff-tree --no-commit-id --shortstat -r

# working example
git diff-tree --no-commit-id --shortstat -r HEAD
```

#### show changed files in a commit
```bash
git diff-tree --no-commit-id --name-only -r

# working example
git diff-tree --no-commit-id --name-only -r HEAD
```

If you want a more detailed version, run with the `--stat`, or `--numstat` or `--dirstat` flags instead of `--name-only`.

source: http://stackoverflow.com/questions/424071/list-all-the-files-for-a-commit-in-git

#### list every changed file between two commits
```bash
git diff --name-only

# working example
git diff --name-only HEAD~3 HEAD
```

source: http://stackoverflow.com/questions/1552340/git-show-all-changed-files-between-two-commits

#### show modifications in a file in a commit
```bash
git diff ~1.. []

# working example
git diff HEAD~1..HEAD
```

You can optionally add a file name to show only changes in a specific file.

#### show files with conflicts
```bash
git diff --name-only --diff-filter=U
```

source: http://stackoverflow.com/questions/3065650/whats-the-simplest-way-to-git-a-list-of-conflicted-files

## Branch

#### deletes already-merged branches

```bash
git branch --merged | grep -v "\*" | xargs -n 1 git branch -d
```

source: http://stevenharman.net/git-clean-delete-already-merged-branches

#### add new branch and switches to this branch

```bash
git checkout -b

# working example
git checkout -b new_branch
```

source: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

## Misc

#### sync fork
```bash
# Requires an "upstream" remote, pointing to original repo
# e.g. `git remote add upstream [email protected]:user/repo.git`
git fetch upstream; git checkout master; git rebase upstream/master
```
source: https://help.github.com/articles/syncing-a-fork

#### assume file as unchanged
```bash
git update-index --assume-unchanged

# working example
git update-index --assume-unchanged .
```

#### undo assume file as unchanged
```bash
git update-index --no-assume-unchanged

# working example
git update-index --no-assume-unchanged .
```

source: http://stackoverflow.com/questions/17195861/undo-a-git-update-index-assume-unchanged-file

#### list files assumed as unchanged
```bash
git ls-files -v|grep '^h'
```

source: http://stackoverflow.com/questions/17195861/undo-a-git-update-index-assume-unchanged-file

## Clean

#### remove untracked files
```bash
# list files that would be removed
git clean -f -n

# remove untracked files
git clean -f
```

source: http://stackoverflow.com/questions/61212/how-do-i-remove-local-untracked-files-from-my-current-git-branch

## Auditing

## Others
More than one line command useful things

- [Git cheat sheet](https://github.com/tiimgreen/github-cheat-sheet)
- [Git ahead and behind info](https://gist.github.com/hugobessaa/8788821)
- [git-overwritten](https://github.com/mislav/dotfiles/blob/7ac8cbfcd56cfa6c39b5719ea183e87878ea6ed5/bin/git-overwritten)