File tree Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
---
3
+ - [ Git Workflows] ( #git-workflows )
4
+ - [ Forks workflow] ( #forks-workflow )
5
+ - [ Cleaning Up Your Work] ( #cleaning-up-your-work )
6
+ - [ Diffs between branches] ( #diffs-between-branches )
7
+ - [ Reset fork based on upstream] ( #reset-fork-based-on-upstream )
8
+ - [ Reset your upstream repository with current] ( #reset-your-upstream-repository-with-current )
9
+ - [ Pushing an existing repo with history to a new blank repo] ( #pushing-an-existing-repo-with-history-to-a-new-blank-repo )
10
+ - [ List changed files] ( #list-changed-files )
11
+ - [ Using worktree] ( #using-worktree )
3
12
4
13
# Git Workflows
5
14
## Forks workflow
@@ -46,7 +55,6 @@ git rebase main
46
55
```
47
56
git diff master:foo foo
48
57
git diff <local branch> <remote>/<remote branch>
49
-
50
58
```
51
59
52
60
## Reset fork based on upstream
@@ -65,7 +73,10 @@ https://stackoverflow.com/a/24768381
65
73
```
66
74
git remote set-url origin https://new.repo/url
67
75
git push origin master --force
68
- # or
76
+ ```
77
+
78
+ or
79
+ ```
69
80
git push origin master --force
70
81
```
71
82
You can’t perform that action at this time.
0 commit comments