summaryrefslogtreecommitdiff
path: root/content/notes/git.md
blob: a4106b1595ba7ff5702a6d14aafaaff1e0c1aa47 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
+++
title = 'git usage notes'
+++

## Documentation

* Official reference: https://git-scm.com/docs

## Commands I often forget

### Committing

Rebase the last 3 commits:
```
git rebase -i HEAD~3
```

Rebase all commits:
```
git rebase -i --root
```

### Working with remotes

Hard reset from remote:
```
git fetch
git reset --hard origin/master
```

### Searching commits

Search for commits containing text:
```
git log --grep="abc"
```

Case-insensitive version:
```
git log -i --grep="abc"
```

Search by author
```
git log --author="guy"
```

Search for commits that modify a file or folder
```
git log -- path/to/file/or/folder
```

Find the oldest tag that contains a commit
```
git describe c2b0ce70add2a7dd6e792341c21278cb94820684
```

List contributors by commit count:
```
git shortlog --summary --numbered --all --no-merges
```