You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
### I want to set a remote branch as the upstream for a local branch
810
800
811
801
You can set a remote branch as the upstream for the current local branch using:
@@ -992,7 +982,6 @@ Sometimes you have several work in progress commits that you want to combine bef
992
982
993
983
This will do an interactive rebase that lists only the commits that you haven't already pushed, so it will be safe to reorder/fix/squash anything in the list.
994
984
995
-
<aname="i-need-to-abort-the-merge"></a>
996
985
#### I need to abort the merge
997
986
998
987
Sometimes the merge can produce problems in certain files, in those cases we can use the option `abort` to abort the current conflict resolution process, and try to reconstruct the pre-merge state.
@@ -1003,7 +992,6 @@ Sometimes the merge can produce problems in certain files, in those cases we can
1003
992
1004
993
This command is available since Git version >= 1.7.4
To find a certain string which was introduced in any commit, you can use the following structure:
@@ -1181,7 +1165,6 @@ $ git log --committer=<name or email>
1181
1165
1182
1166
Keep in mind that author and committer are not the same. The `--author` is the person who originally wrote the code; on the other hand, the `--committer`, is the person who committed the code on behalf of the original author.
If someone has sent you a pull request on GitHub, but then deleted their original fork, you will be unable to clone their repository or to use `git am` as the [.diff, .patch](https://github.com/blog/967-github-secrets) urls become unavailable. But you can checkout the PR itself using [GitHub's special refs](https://gist.github.com/piscisaureus/3342247). To fetch the content of PR#1 into a new branch called pr_1:
### I want to make Git ignore permissions and filemode changes
1407
1383
1408
1384
```sh
@@ -1415,7 +1391,6 @@ If you want to make this the default behaviour for logged-in users, then use:
1415
1391
$ git config --global core.fileMode false
1416
1392
```
1417
1393
1418
-
<ahref="#ive-no-idea-what-i-did-wrong"></a>
1419
1394
## I've no idea what I did wrong
1420
1395
1421
1396
So, you're screwed - you `reset` something, or you merged the wrong branch, or you force pushed and now you can't find your commits. You know, at some point, you were doing alright, and you want to go back to some state you were at.
0 commit comments