Skip to content

Commit 5a8abbd

Browse files
authored
Merge pull request git-tips#144 from eliranmal/master
update remote sync tip, git-ignore idea config
2 parents 143814b + 5eca1eb commit 5a8abbd

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
.idea
12
node_modules
23
npm-debug.log

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
1414
* [Everyday Git in twenty commands or so](#everyday-git-in-twenty-commands-or-so)
1515
* [Show helpful guides that come with Git](#show-helpful-guides-that-come-with-git)
1616
* [Search change by content](#search-change-by-content)
17-
* [Overwrite pull](#overwrite-pull)
17+
* [Sync with remote - overwrite local changes](#sync-with-remote-overwrite-local-changes)
1818
* [List of all files till a commit](#list-of-all-files-till-a-commit)
1919
* [Git reset first commit](#git-reset-first-commit)
2020
* [List all the conflicted files](#list-all-the-conflicted-files)
@@ -185,9 +185,9 @@ git help -g
185185
git log -S'<a term in the source>'
186186
```
187187

188-
## Overwrite pull
188+
## Sync with remote - overwrite local changes
189189
```sh
190-
git fetch origin && git reset --hard origin/master
190+
git fetch origin && git reset --hard origin/master && git clean -f -d
191191
```
192192

193193
## List of all files till a commit

0 commit comments

Comments
 (0)