forked from git-tips/tips
-
Notifications
You must be signed in to change notification settings - Fork 0
/
tips.json
437 lines (437 loc) · 17.2 KB
/
tips.json
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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
[{
"title": "Everyday Git in twenty commands or so",
"tip": "git help everyday"
}, {
"title": "Show helpful guides that come with Git",
"tip": "git help -g"
}, {
"title": "Overwrite pull",
"tip": "git fetch --all && git reset --hard origin/master"
}, {
"title": "List of all files till a commit",
"tip": "git ls-tree --name-only -r <commit-ish>"
}, {
"title": "Git reset first commit",
"tip": "git update-ref -d HEAD"
}, {
"title": "List all the conflicted files",
"tip": "git diff --name-only --diff-filter=U"
}, {
"title": "List of all files changed in a commit",
"tip": "git diff-tree --no-commit-id --name-only -r <commit-ish>"
}, {
"title": "Unstaged changes since last commit",
"tip": "git diff"
}, {
"title": "Changes staged for commit",
"tip": "git diff --cached",
"alternatives": ["git diff --staged"]
}, {
"title": "Show both staged and unstaged changes",
"tip": "git diff HEAD"
}, {
"title": "List all branches that are already merged into master",
"tip": "git branch --merged master"
}, {
"title": "Quickly switch to the previous branch",
"tip": "git checkout -"
}, {
"title": "Remove branches that have already been merged with master",
"tip": "git branch --merged master | grep -v '^\\*' | xargs -n 1 git branch -d",
"alternatives": ["git branch --merged master | grep -v '^\\*\\| master' | xargs -n 1 git branch -d # will not delete master if master is not checked out"]
}, {
"title": "List all branches and their upstreams, as well as last commit on branch",
"tip": "git branch -vv"
}, {
"title": "Track upstream branch",
"tip": "git branch -u origin/mybranch"
}, {
"title": "Delete local branch",
"tip": "git branch -d <local_branchname>"
}, {
"title": "Delete remote branch",
"tip": "git push origin --delete <remote_branchname>",
"alternatives": ["git push origin :<remote_branchname>"]
}, {
"title": "Delete local tag",
"tip": "git tag -d <tag-name>"
}, {
"title": "Delete remote tag",
"tip": "git push origin :refs/tags/<tag-name>"
}, {
"title": "Undo local changes with the last content in head",
"tip": "git checkout -- <file_name>"
}, {
"title": "Revert: Undo a commit by creating a new commit",
"tip": "git revert <commit-ish>"
}, {
"title": "Reset: Discard commits, advised for private branch",
"tip": "git reset <commit-ish>"
}, {
"title": "Reword the previous commit message",
"tip": "git commit -v --amend"
}, {
"title": "See commit history for just the current branch",
"tip": "git cherry -v master"
}, {
"title": "Amend author.",
"tip": "git commit --amend --author='Author Name <[email protected]>'"
}, {
"title": "Reset author, after author has been changed in the global config.",
"tip": "git commit --amend --reset-author --no-edit"
}, {
"title": "Changing a remote's URL",
"tip": "git remote set-url origin <URL>"
}, {
"title": "Get list of all remote references",
"tip": "git remote",
"alternatives": ["git remote show"]
}, {
"title": "Get list of all local and remote branches",
"tip": "git branch -a"
}, {
"title": "Get only remote branches",
"tip": "git branch -r"
}, {
"title": "Stage parts of a changed file, instead of the entire file",
"tip": "git add -p"
}, {
"title": "Get git bash completion",
"tip": "curl http://git.io/vfhol > ~/.git-completion.bash && echo '[ -f ~/.git-completion.bash ] && . ~/.git-completion.bash' >> ~/.bashrc"
}, {
"title": "What changed since two weeks?",
"tip": "git log --no-merges --raw --since='2 weeks ago'",
"alternatives": ["git whatchanged --since='2 weeks ago'"]
}, {
"title": "See all commits made since forking from master",
"tip": "git log --no-merges --stat --reverse master.."
}, {
"title": "Pick commits across branches using cherry-pick",
"tip": "git checkout <branch-name> && git cherry-pick <commit-ish>"
}, {
"title": "Find out branches containing commit-hash",
"tip": "git branch -a --contains <commit-ish>",
"alternatives": ["git branch --contains <commit-ish>"]
}, {
"title": "Git Aliases",
"tip": "git config --global alias.<handle> <command> \ngit config --global alias.st status"
}, {
"title": "Saving current state of tracked files without commiting",
"tip": "git stash",
"alternatives": ["git stash save"]
}, {
"title": "Saving current state including untracked files",
"tip": "git stash save -u",
"alternatives": ["git stash save --include-untracked"]
}, {
"title": "Show list of all saved stashes",
"tip": "git stash list"
}, {
"title": "Apply any stash without deleting from the stashed list",
"tip": "git stash apply <stash@{n}>"
}, {
"title": "Apply last stashed state and delete it from stashed list",
"tip": "git stash pop",
"alternatives": ["git stash apply stash@{0} && git stash drop stash@{0}"]
}, {
"title": "Delete all stored stashes",
"tip": "git stash clear",
"alternatives": ["git stash drop <stash@{n}>"]
}, {
"title": "Grab a single file from a stash",
"tip": "git checkout <stash@{n}> -- <file_path>",
"alternatives": ["git checkout stash@{0} -- <file_path>"]
}, {
"title": "Show all tracked files",
"tip": "git ls-files -t"
}, {
"title": "Show all untracked files",
"tip": "git ls-files --others"
}, {
"title": "Show all ignored files",
"tip": "git ls-files --others -i --exclude-standard"
}, {
"title": "Create new working tree from a repository (git 2.5)",
"tip": "git worktree add -b <branch-name> <path> <start-point>"
}, {
"title": "Create new working tree from HEAD state",
"tip": "git worktree add --detach <path> HEAD"
}, {
"title": "Untrack files without deleting",
"tip": "git rm --cached <file_path>",
"alternatives": ["git rm --cached -r <directory_path>"]
}, {
"title": "Before deleting untracked files/directory, do a dry run to get the list of these files/directories",
"tip": "git clean -n"
}, {
"title": "Forcefully remove untracked files",
"tip": "git clean -f"
}, {
"title": "Forcefully remove untracked directory",
"tip": "git clean -f -d",
"alternatives": ["git clean -df"]
}, {
"title": "Update all the submodules",
"tip": "git submodule foreach git pull",
"alternatives": ["git submodule update --init --recursive", "git submodule update --remote"]
}, {
"title": "Show all commits in the current branch yet to be merged to master",
"tip": "git cherry -v master",
"alternatives": ["git cherry -v master <branch-to-be-merged>"]
}, {
"title": "Rename a branch",
"tip": "git branch -m <new-branch-name>",
"alternatives": ["git branch -m [<old-branch-name>] <new-branch-name>"]
}, {
"title": "Rebases 'feature' to 'master' and merges it in to master ",
"tip": "git rebase master feature && git checkout master && git merge -"
}, {
"title": "Archive the `master` branch",
"tip": "git archive master --format=zip --output=master.zip"
}, {
"title": "Modify previous commit without modifying the commit message",
"tip": "git add --all && git commit --amend --no-edit"
}, {
"title": "Prunes references to remote branches that have been deleted in the remote.",
"tip": "git fetch -p",
"alternatives": ["git remote prune origin"]
}, {
"title": "Retrieve the commit hash of the initial revision.",
"tip": " git rev-list --reverse HEAD | head -1",
"alternatives": ["git rev-list --max-parents=0 HEAD", "git log --pretty=oneline | tail -1 | cut -c 1-40", "git log --pretty=oneline --reverse | head -1 | cut -c 1-40"]
}, {
"title": "Visualize the version tree.",
"tip": "git log --pretty=oneline --graph --decorate --all",
"alternatives": ["gitk --all"]
}, {
"title": "Deploying git tracked subfolder to gh-pages",
"tip": "git subtree push --prefix subfolder_name origin gh-pages",
"alternatives": "git subtree push --prefix subfolder_name origin branch_name"
}, {
"title": "Adding a project to repo using subtree",
"tip": "git subtree add --prefix=<directory_name>/<project_name> --squash [email protected]:<username>/<project_name>.git master"
}, {
"title": "Get latest changes in your repo for a linked project using subtree",
"tip": "git subtree pull --prefix=<directory_name>/<project_name> --squash [email protected]:<username>/<project_name>.git master"
}, {
"title": "Export a branch with history to a file.",
"tip": "git bundle create <file> <branch-name>"
}, {
"title": "Import from a bundle",
"tip": "git clone repo.bundle <repo-dir> -b <branch-name>"
}, {
"title": "Get the name of current branch.",
"tip": "git rev-parse --abbrev-ref HEAD"
}, {
"title": "Ignore one file on commit (e.g. Changelog).",
"tip": "git update-index --assume-unchanged Changelog; git commit -a; git update-index --no-assume-unchanged Changelog"
}, {
"title": "Stash changes before rebasing",
"tip": "git rebase --autostash"
}, {
"title": "Fetch pull request by ID to a local branch",
"tip": "git fetch origin pull/<id>/head:<branch-name>",
"alternatives": ["git pull origin pull/<id>/head:<branch-name>"]
}, {
"title": "Show the most recent tag on the current branch.",
"tip": "git describe --tags --abbrev=0"
}, {
"title": "Show inline word diff.",
"tip": "git diff --word-diff"
}, {
"title": "Show changes using common diff tools.",
"tip": "git difftool -t <commit1> <commit2> <path>"
}, {
"title": "Don’t consider changes for tracked file.",
"tip": "git update-index --assume-unchanged <file_name>"
}, {
"title": "Undo assume-unchanged.",
"tip": "git update-index --no-assume-unchanged <file_name>"
}, {
"title": "Clean the files from `.gitignore`.",
"tip": "git clean -X -f"
}, {
"title": "Restore deleted file.",
"tip": "git checkout <deleting_commit>^ -- <file_path>"
}, {
"title": "Restore file to a specific commit-hash",
"tip": "git checkout <commit-ish> -- <file_path>"
}, {
"title": "Always rebase instead of merge on pull.",
"tip": "git config --global pull.rebase true",
"alternatives" : ["#git < 1.7.9\ngit config --global branch.autosetuprebase always"]
}, {
"title": "List all the alias and configs.",
"tip": "git config --list"
}, {
"title": "Make git case sensitive.",
"tip": "git config --global core.ignorecase false"
},{
"title": "Add custom editors.",
"tip": "git config --global core.editor '$EDITOR'"
}, {
"title": "Auto correct typos.",
"tip": "git config --global help.autocorrect 1"
}, {
"title": "Check if the change was a part of a release.",
"tip": "git name-rev --name-only <SHA-1>"
}, {
"title": "Dry run. (any command that supports dry-run flag should do.)",
"tip": "git clean -fd --dry-run"
}, {
"title": "Marks your commit as a fix of a previous commit.",
"tip": "git commit --fixup <SHA-1>"
}, {
"title": "Squash fixup commits normal commits.",
"tip": "git rebase -i --autosquash"
}, {
"title": "Skip staging area during commit.",
"tip": "git commit --only <file_path>"
}, {
"title": "Interactive staging.",
"tip": "git add -i"
}, {
"title": "List ignored files.",
"tip": "git check-ignore *"
}, {
"title": "Status of ignored files.",
"tip": "git status --ignored"
}, {
"title": "Commits in Branch1 that are not in Branch2",
"tip": "git log Branch1 ^Branch2"
}, {
"title": "Reuse recorded resolution, record and reuse previous conflicts resolutions.",
"tip": "git config --global rerere.enabled 1"
}, {
"title": "Open all conflicted files in an editor.",
"tip": "git diff --name-only | uniq | xargs $EDITOR"
}, {
"title": "Count unpacked number of objects and their disk consumption.",
"tip": "git count-objects --human-readable"
}, {
"title": "Prune all unreachable objects from the object database.",
"tip": "git gc --prune=now --aggressive"
}, {
"title": "Instantly browse your working repository in gitweb.",
"tip": "git instaweb [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]"
}, {
"title": "View the GPG signatures in the commit log",
"tip": "git log --show-signature"
}, {
"title": "Remove entry in the global config.",
"tip": "git config --global --unset <entry-name>"
}, {
"title": "Checkout a new branch without any history",
"tip": "git checkout --orphan <branch_name>"
}, {
"title": "Extract file from another branch.",
"tip": "git show <branch_name>:<file_name>"
}, {
"title": "List only the root and merge commits.",
"tip": "git log --first-parent"
}, {
"title": "Change previous two commits with an interactive rebase.",
"tip": "git rebase --interactive HEAD~2"
}, {
"title": "List all branch is WIP",
"tip": "git checkout master && git branch --no-merged"
}, {
"title": "Find guilty with binary search",
"tip": "git bisect start # Search start \ngit bisect bad # Set point to bad commit \ngit bisect good v2.6.13-rc2 # Set point to good commit|tag \ngit bisect bad # Say current state is bad \ngit bisect good # Say current state is good \ngit bisect reset # Finish search \n"
}, {
"title": "Bypass pre-commit and commit-msg githooks",
"tip": "git commit --no-verify"
}, {
"title": "List commits and changes to a specific file (even through renaming)",
"tip": "git log --follow -p -- <file_path>"
},{
"title": "Clone a single branch",
"tip": "git clone -b <branch-name> --single-branch https://github.com/user/repo.git"
},{
"title": "Create and switch new branch",
"tip": "git checkout -b <branch-name>",
"alternatives": ["git branch <branch-name> && git checkout <branch-name>"]
},{
"title": "Ignore file mode changes on commits",
"tip": "git config core.fileMode false"
},{
"title": "Turn off git colored terminal output",
"tip": "git config --global color.ui false"
},{
"title": "Specific color settings",
"tip": "git config --global <specific command e.g branch, diff> <true, false or always>"
},{
"title": "Show all local branches ordered by recent commits",
"tip": "git for-each-ref --sort=-committerdate --format='%(refname:short)' refs/heads/"
},{
"title": "Find lines matching the pattern (regex or string) in tracked files",
"tip": "git grep --heading --line-number 'foo bar'"
}, {
"title": "Clone a shallow copy of a repository",
"tip": "git clone https://github.com/user/repo.git --depth 1"
}, {
"title": "Search Commit log across all branches for given text",
"tip": "git log --all --grep='<given-text>'"
}, {
"title": "Get first commit in a branch (from master)",
"tip": "git log master..<branch-name> --oneline | tail -1"
}, {
"title": "Unstaging Staged file",
"tip": "git reset HEAD <file-name>"
}, {
"title": "Force push to Remote Repository",
"tip": "git push -f <remote-name> <branch-name>"
}, {
"title": "Adding Remote name",
"tip": "git remote add <remote-nickname> <remote-url>"
}, {
"title": "Show the author, time and last revision made to each line of a given file",
"tip": "git blame <file-name>"
}, {
"title": "Group commits by authors and title",
"tip": "git shortlog"
}, {
"title": "Forced push but still ensure you don't overwrite other's work",
"tip": "git push --force-with-lease <remote-name> <branch-name>"
},{
"title": "Show how many lines does an author contribute",
"tip": "git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | gawk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s removed lines: %s total lines: %s\n\", add, subs, loc }' -",
"alternatives": ["git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s, removed lines: %s, total lines: %s\n\", add, subs, loc }' - # on Mac OSX"]
},{
"title": "Revert: Reverting an entire merge",
"tip": "git revert -m 1 <commit-ish>"
},{
"title": "Number of commits in a branch",
"tip": "git rev-list --count <branch-name>"
},{
"title": "Alias: git undo",
"tip": "git config --global alias.undo '!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f'"
}, {
"title": "Add object notes",
"tip": "git notes add -m 'Note on the previous commit....'"
}, {
"title": "Show all the git-notes",
"tip": "git log --show-notes='*'"
}, {
"title": "Apply commit from another repository",
"tip": "git --git-dir=<source-dir>/.git format-patch -k -1 --stdout <SHA1> | git am -3 -k"
},{
"title": "Specific fetch reference",
"tip": "git fetch origin master:refs/remotes/origin/mymaster"
}, {
"title": "Find common ancestor of two branches",
"tip": "diff -u <(git rev-list --first-parent BranchA) <(git rev-list --first-parent BranchB) | sed -ne 's/^ //p' | head -1"
}, {
"title": "List unpushed git commits",
"tip": "git log --branches --not --remotes",
"alternatives": ["git log @{u}..", "git cherry -v"]
}, {
"title": "Add everything, but whitespace changes",
"tip": "git diff --ignore-all-space | git apply --cached"
}, {
"title": "Edit [local/global] git config",
"tip": "git config [--global] --edit"
}, {
"title": "blame on certain range",
"tip": "git blame -L <start>,<end>"
}]