If you have node installed, uou can run [`npx gitignore`][1] to generate `.gitignore` files:

```bash
npx gitignore VisualStudio
```

[1]: https://www.npmjs.com/package/gitignore

I've installed Git to do some development using Visual Studio 2008. Most of the work will be new development but we do have some old projects from prior to VS2005 that I want to bring over into the new repository.  There is an existing thread about general [VS/Git integration][1] but my question is limited to the .gitignore file and Visual Studio.

My question has two parts: 

- What entries should be included in the .gitignore file to cover the Visual Studio specific files like binaries, assemblies, debug files, etc?  Some were covered in the thread mentioned above but is there a comprehensive set?

- In what situations have you needed to exclude files globally, or for a single repository, or using the environment variable?

I already know the HOW. Here is an excerpt from the Git [user-manual][2] on ignoring files.

> If you wish the exclude patterns to
> affect only certain repositories
> (instead of every repository for a
> given project), you may instead put
> them in a file in your repository
> named .git/info/exclude, or in any
> file specified by the
> core.excludesfile configuration
> variable. Some git commands can also
> take exclude patterns directly on the
> command line. See [gitignore(5)][3] for the
> details.



  [1]: https://stackoverflow.com/questions/507343/using-git-with-visual-studio
  [2]: http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
  [3]: http://git-scm.com/docs/gitignore

Files to ignore when using Visual Studio with Git

## Branch Rename is now available through GitHub API

You can [**rename a branch with the GitHub REST API**][1].

And you can easily [**run API commands via the `gh` CLI**][2] all like this:

```bash
gh api "repos/{owner}/{repo}/branches/{branch}/rename" -f new_name={newBranch}
```




[1]: https://docs.github.com/en/rest/reference/branches#rename-a-branch
[2]: https://cli.github.com/manual/gh_api

I just renamed my local branch using

    git branch -m oldname newname

but this only renames the local version of the branch. How can I rename the one on GitHub?

Renaming a branch in GitHub

You're missing the basic trick that (see "unless" in a moment) git aliases are just direct git-only commands, with no shell involved and no ability to run non-git commands:

    [alias]
        foo = checkout

*unless* preceded by a shell escape `!` character:

    [alias]
        bar = !git checkout

(at this point both aliases mean the same thing).  Since you *want* the shell to get involved, so as to run sub-commands `$(...)` and pipes `... | ...`—these are all "shell" things, not "git" things—you need the `!` prefix syntax.  All the rest of your experimentation will then go much better.

---

That said, addressing your base problem: I know little about most GUI editors, but in gitk you can select any revision you like in the topmost pane, click the "tree" selector in the lower right pane, and then select any file in the tree (going through directories as needed) to view the file in the lower left pane.  It's true that this will not get you the whole tree, of course, just one file at a time.  (Click back on the "patch" selector to go back to viewing patches.)

The other thing I would do here is to avoid these `HEAD`-relative operations when possible: instead of "step forward one" (which is tricky), you can start from a known fixed point—or at least, fixed for the duration of the demo—such as a branch name, and use git's revision syntax (see [gitrevisions](https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html)) to select commits however far back you mean:

    git checkout master~5
    ... demonstrate something ...
    git checkout master~4
    ... demonstrate next thing ...

The <code>~<i>n</i></code> syntax tells git to count backwards for *`n`* parents, following only first-parent links in case of merge commits.  Since 4 is one less than 5, `master~4` is necessarily one hop closer to `master` than `master~5`.  (If there are merges, the two items being merged are the same distance, hop-wise, from whatever starting point you choose, so this particular method is too simple to capture the truth.  You can start doing `master~3^2~2` for instance, but it gets quite messy.)

I'm very new to Git, and I'm trying to step through the commits from a repository.  Rather than copy and pasting the SHA's for each commit, I'm using [this method to get the next commit after the HEAD][get next rev]:

    git checkout $(git rev-list HEAD..master | tail -n 1)

This works perfectly, but I'm using it a lot so I'd like to clean up the syntax a little with an [alias][alias].  

### First Attempt

In an ideal world, a function called something like "child-sha" would return the contents of the entire lookup so it could be called like this in powershell:

    git checkout child-sha

If open up the /.config file, I can add the command by adding the following section:

    [alias]
        child-sha = $(git rev-list HEAD..master | tail -n 1)

But when I execute it, I get the following error

> Expansion of alias 'child-sha' failed; '$(git' is not a git command

### Second Attempt

Okay, so no using `$()`.  If I edit the config file as follows:

    [alias]
        child-sha = rev-list HEAD..master | tail -n 1

Then call like this:

    git checkout $(git child-sha)

Then I get the following Error

> fatal: ambiguous argument '|': unknown revision or path not in the working tree

### Third Attempt - Working, but sloppy

Okay, so no using the Pipe (`|`).  If I update my config file like this:

    git config --local alias.child-shas "rev-list HEAD..master"

Then I call like this:

    get checkout $(git child-shas | tail -n 1)

Then it works, but I haven't saved *that* much space.

I'm not really sure what each of the functions in the script are doing as I'm really new to Git and Powershell commands in general.  Google searches for the docs for using `$`, or `|` or `tail` don't reveal anything helpful as special characters are often stripped out of searches.

Is there any way to abbreviate this function?

-----

In a separate inquiry, what I'm really looking to do is just step through every checkout so I can view the entire code base at that point in time so I can setup a small demo for a presentation.  I doesn't seem as if any GUI editor ([GitHub Windows][GitHub Windows], [gitk], or [Visual Studio Tools for Git][Visual Studio Tools for Git]) easily gives you the ability to checkout a particular commit; say, for example, by right clicking through the list of commits. 


[get next rev]: https://stackoverflow.com/a/3557291/1366033

[alias]: https://git.wiki.kernel.org/index.php/Aliases

[GitHub Windows]: https://windows.github.com/

[gitk]: http://git-scm.com/docs/gitk
[Visual Studio Tools for Git]: http://visualstudiogallery.msdn.microsoft.com/abafc7d6-dcaa-40f4-8a5e-d6724bdb980c

Creating alias in git

If you're updating scripts in a windows environment that are being deployed to a linux filesystem, even though they are permitted to run locally, you may still find yourself needing to grant execute before pushing.

From this article on [Change file permissions when working with git repo's on windows][1]:

1. Open up a bash terminal like git-bash on Windows
2. Navigate to the `.sh` file where you want to grant execute permissions
3. Check the existing permissions with the following command:

    ```bash
    git ls-files --stage 
    ```

    Which should return something like *100644*

4. Update the permissions with the following command

    ```bash
    git update-index --chmod=+x 'name-of-shell-script'
    ```

5. Check the file permission again 

    ```bash
    git ls-files --stage 
    ```

    Which should return something like *100755*

6. Commit changes and push!


[![git bash on windows][2]][2]


  [1]: https://medium.com/@akash1233/change-file-permissions-when-working-with-git-repos-on-windows-ea22e34d5cee
  [2]: https://i.stack.imgur.com/9oUd2.jpg

How do I update file permissions with `git-bash` on Windows 7?

I've tried the following without success:

    $ ls -al scripts/script.sh
    -rw-r--r--    1 myUid   Administ       70 Sep  8 11:24 scripts/script.sh
    
    $ git update-index --chmod=+x scripts/script.sh
    
    $ ls -al scripts/script.sh
    -rw-r--r--    1 myUid   Administ       70 Sep  8 11:24 scripts/script.sh
    
    $ chmod +x scripts/script.sh
    
    $ ls -al scripts/script.sh
    -rw-r--r--    1 myUid   Administ       70 Sep  8 11:24 scripts/script.sh

Updating file permissions with git-bash on Windows 7

This just has to do with how each of those different languages handle **variable expansion**.

[**cmd**][1]:&nbsp; `C:\> echo %USERPROFILE%`  
[**bash**][2]: `$ echo $USERPROFILE`  
[**ps**][3]:&nbsp;&nbsp;&nbsp;&nbsp; `PS> echo $env:USERPROFILE`

In windows cmd prompt, variables should be surrounded by `%` on either side  
Whereas Bash and PowerShell indicate a variables by prefixing with a `$`.  

Git Bash [gets all existing Windows environment variables at startup][4], while powershell tries to limit polluting the global namespace by including them under the `$env` object

[![Shell Comparison][5]][5]

If you want to confirm the shell has access to the environment variable, you can **list all variables**:

[**cmd**][6] *([docs][7])*:&nbsp; `C:\> SET`  
[**bash**][8] *([docs][9])*: `$ printenv`  
[**ps**][10] *([docs][11])*:&nbsp;&nbsp;&nbsp;&nbsp; `PS> Get-ChildItem env:`


  [1]: https://ss64.com/nt/syntax-variables.html
  [2]: https://ss64.com/bash/syntax-variables.html
  [3]: https://ss64.com/ps/syntax-variables.html
  [4]: https://stackoverflow.com/a/38385930/1366033
  [5]: https://i.stack.imgur.com/sH4kB.png
  [6]: https://stackoverflow.com/q/5327495/1366033
  [7]: https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/set_1
  [8]: https://askubuntu.com/q/275965/349745
  [9]: https://ss64.com/bash/printenv.html
  [10]: https://stackoverflow.com/q/39800481/1366033
  [11]: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_environment_variables

I have the same issue like https://stackoverflow.com/questions/32186840/git-for-windows-doesnt-execute-my-bashrc-file and tried to make the same steps. But my Git Bash (2.5.0, 64bit on Windows 7, 64bit) doesn't know my `%USERPROFILE%`.

    pitgrap@xxx MINGW64 /
    $ pwd
    /
    
    pitgrap@xxx MINGW64 /
    $ cd ~
    bash: cd: /%USERPROFILE%: No such file or directory

If I run Git Bash as Administror, it works. :( 
But I don't want to run it everytime as Administrator. Any ideas?


Git for Windows doesn't know %USERPROFILE%


The long answer is 'yes'!

Full credit to Raymond Chen's article [**Combining two files into one while preserving line history**][1]:

Imagine you had two files: `fruits` & `veggies`

[![git blame for both fruits and veggies][2]][2]

> The naïve way of combining the files would be to do it in a single commit, but you'll lose line history on one of the files (or both)
>
> You could tweak the `git blame` algorithms with options like `-M` and `-C` to get it to try harder, but in practice, you don’t often have control over those options (eg. the git blame may be performed on a server)
>
> ### The trick is to use a `merge` with two forked branches
>
> * In one branch, we rename `veggies` to `produce`.
> * In the other branch, we rename `fruits` to `produce`.
>
>```bash
>git checkout -b rename-veggies
>git mv veggies produce
>git commit -m "rename veggies to produce"
>```
>
>```bash
>git checkout -
>git mv fruits produce
>git commit -m "rename fruits to produce"
>```
>
> Then merge the first into the second
>
>```bash
>git merge -m "combine fruits and veggies" rename-veggies
>```
>
>This will generate a merge conflict - that's okay - now take the changes from each branch's Produce file and combine into one - here's a simple concatenation (but resolve the merge conflict however you please):
>
>```bash
>cat "produce~HEAD" "produce~rename-veggies" >produce
>git add produce
>git merge --continue
>```
>
> ***The resulting `produce` file was created by a merge, so git knows to look in both parents of the merge to learn what happened.***  
>
> [![git blame for produce][3]][3]
>
> And that’s where it sees that each parent contributed half of the file, and it also sees that the files in each branch were themselves created via renames of other files, so it can chase the history back into both of the original files.
>
> Each line should be correctly attributed to the person who introduced it in the original file, whether it’s fruits or veggies. People investigating the produce file get a more accurate history of who last touched each line of the file.
>
> For best results, your rename commit should be a pure rename. Resist the temptation to edit the file’s contents at the same time you rename it. A pure rename ensure that git’s rename detection will find the match. If you edit the file in the same commit as the rename, then whether the rename is detected as such will depend on git’s “similar files” heuristic.

Checkout [the full article][1] for a full step by step breakdown and more explanations

---

Originally, I had thought this might be [a use case][4] for [`git merge-file`][5] doing something like this:

```bash
>produce echo #empty
git merge-file fruits produce veggies --union -p > produce
git rm fruits veggies
git add produce
git commit -m "combine fruits and veggies"
```

However, all this does is help simulate the merge diffing algorithm against two different files - the end output when committed is identical to if the file had been updated manually and the resulting changes manually committed


  [1]: https://devblogs.microsoft.com/oldnewthing/20190514-00/?p=102493
  [2]: https://i.stack.imgur.com/sIiBQ.png
  [3]: https://i.stack.imgur.com/idgVB.png
  [4]: https://stackoverflow.com/q/9862173/1366033
  [5]: http://schacon.github.io/git/git-merge-file.html

Imagine that you have two files in a git repository, say `A.txt` and `B.txt`.

Is it possible to concat the two files into a third one `A+B.txt`, removing the original `A.txt` and `B.txt` and committing it all, so the history is still preserved? 

That is, if I asked `git log --follow A+B.txt` I would know that the content originated from the `A.txt` and `B.txt` files?

I've tried to separate the files into two different branches and then merging them into a new file (while removing the old ones), but to no avail.

git combining two files into one with history preserved

## This is *almost* Natively Supported w/ Github CLI

1. Download [Github CLI][1]
2. Login

    ```bash
    gh auth login
    ```

3. List repos and pipe into clone command

    **Bash**

    ```bash
    gh repo list <userName> --limit 999 --json name --jq ".[]|.name" \ 
      | xargs -L1 gh repo clone
    ```

    **PowerShell**

    ```bash
    gh repo list <userName> --limit 999 --json name --jq ".[]|.name" |
       ForEach-Object { gh repo clone $_ }
    ```



**Further Reading**: [How to clone all repos at once from GitHub?][2]

[1]: https://cli.github.com/
[2]: https://stackoverflow.com/q/19576742/1366033

I'm trying to clone all of my repos at once to my computer, all of which are private. I've tried countless one-liners and scripts (namely, the ones [here][1] and [here][2]), but none of them work.

Initially I would get errors back about JSON not being able to parse the response, which I eventually realized was because the response was empty since I had no public repos. When I made a test public repo, it would return a JSON object with the info for that specific repo, but none of the private ones. From what I understand, I need to pass both my username and an access token to GitHub, in which the access token was generated at `Settings > Developer settings > Personal access tokens`.

I've tried both of the following formats to no avail:

    curl -i -u [[USERNAME]]:[[TOKEN]] -s https://api.github.com/users/[[USERNAME]]/repos?per_page=100 [[...]]

    curl -i -u [[USERNAME]] -s https://api.github.com/users/[[USERNAME]]/repos?per_page=100&access_token=[[TOKEN]] [[...]]

The `[[...]]` part that follows is various code snippets like the ones in the links above. I believe these parts are fine, as they clone public repos without any issues, and rather the issue lies in me not being able to see my private repos despite having an access token. It is important to note that when you generate the access token, you define the scopes for what it can do, and I've defined mine with full access to everything, including `repo`, which should grant it control over private repos.

Additionally, sometimes when I would try the command above, I would get the following response:

     HTTP/1.1 401 Unauthorized
    Server: GitHub.com
    Date: Fri, 13 Oct 2017 08:08:01 GMT
    Content-Type: application/json; charset=utf-8
    Content-Length: 93
    Status: 401 Unauthorized
    X-GitHub-Media-Type: github.v3; format=json
    X-RateLimit-Limit: 60
    X-RateLimit-Remaining: 41
    X-RateLimit-Reset: 1507884238
    Access-Control-Expose-Headers: ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
    Access-Control-Allow-Origin: *
    Content-Security-Policy: default-src 'none'
    Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
    X-Content-Type-Options: nosniff
    X-Frame-Options: deny
    X-XSS-Protection: 1; mode=block
    X-Runtime-rack: 0.060685
    X-GitHub-Request-Id: D038:4E67:1349CC:2CB494:59E07461
    
    {
      "message": "Bad credentials",
      "documentation_url": "https://developer.github.com/v3"
    }
Despite knowing that my credentials are just fine.

Does anyone have any idea what's going wrong for me? I've been running circles around this for hours and have come up empty.


  [1]: https://gist.github.com/caniszczyk/3856584
  [2]: https://stackoverflow.com/questions/19576742/how-to-clone-all-repos-at-once-from-github

How to clone all repos (including private repos) from GitHub?

Since this questions is about finding the *count* of changes, there are a couple git commands that do this natively, without having to add `| wc -l` to your command

You can use [`git diff`][1] with the following args:

* [`--stat`][2] - generate a diffstat
* [`--numstat`][3] - shows number of added and deleted lines in decimal notation
* [`--shortstat`][4] - only the last line of the --stat

```bash
$ git diff --stat

src/models/models.ts | 5 +++++
src/utils/git.ts     | 9 ++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
```

```bash
$ git diff --numstat

5       0       src/models/models.ts
6       3       src/utils/git.ts
```

```bash
$ git diff --shortstat

2 files changed, 11 insertions(+), 3 deletions(-)
```

[1]: https://git-scm.com/docs/git-diff
[2]: https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---statltwidthgtltname-widthgtltcountgt
[3]: https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---numstat
[4]: https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---shortstat

How can I find out the number of modified files in the index? That is to say, files that show as "modified" when running `git status`.

I know lots of visual git tools that do this, as well as shell add-ons that show the count next to the prompt, but I just don't see how to do it on the command line in a reasonable way.

Number of modified files in git index

From Mark Longair's answer to [How to make quick backup of untracked files which I want to delete by git clean?][1]:

> The following command will create a tar archive in your home directory of all of the untracked (and not ignored) files in your directory:
> 
> ```bash
> git ls-files --others --exclude-standard -z | xargs -0 tar rvf ~/backup-untracked.tar
> ```
> 
> If you're going to use this technique, check carefully that `git ls-files --others --exclude-standard` on its own produces the list of files you expect!
> 
> A few notes on this solution might be in order:
>
> * I've used `-z` to get `git ls-files` to output the list of files with `NUL` (a zero byte) as the separator between files, and the `-0` parameter to `xargs` tells it to consider `NUL` to be the separator between the parameters it reads from standard input.  This is a standard trick to deal with the possibility that a filename might contain a newline, since the only two bytes that aren't allowed in filenames on Linux are `NUL` and `/`.
> * If you have a huge number of untracked files then `xargs` will run the `tar` command more than once, so it's important that I've told `tar` to append files (`r`) rather than create a new archive (`c`), otherwise the later invocations of `tar` will overwrite the archive created just before.

[1]: https://stackoverflow.com/a/5211854/1366033

I got PC from previous developer. There are many untracked files and folders (>400) in git. Project should work without them, but I don't want to delete or stash them. Maybe I'll have some usage later.

Is there way to move them with structure to Backup folder out of git? 

Git move all untracked files and folders to directory out of git?

Per Will Anderson's post on [Inspecting Git Traffic in Fiddler][1], you can route git traffic to fidler by setting the git config:



    git config --global http.proxy 127.0.0.1:8888
    git config --global http.sslVerify false

Then when you're done, undo by calling `--unset` on the config properties:



    git config --global --unset http.proxy
    git config --global --unset http.sslVerify

[1]: https://willi.am/blog/2014/05/08/inspecting-git-traffic-in-fiddler/

Similar to the question on using [a proxy (like fiddler) to intercept requests made from Node.js][1], is it possible to listen to communications made by git

Local git commands like `checkout` and `commit` don't make any external requests.  
But remote commands like `push` and `pull` should make network requests

However, they don't show up in fiddler when monitoring "All Processes"

[1]: https://stackoverflow.com/q/8697344/1366033

How to Inspect git traffic in Fiddler

The clock is the "Progress Badge" which is visible while VS Code is getting repository info and status:

![VS Code Git Progress Badge][1]

You can disable it in settings:


```js
{ 
  // controls whether git actions should show progress
  "git.showProgress": true
}
```


  [1]: https://i.stack.imgur.com/zgkrn.png

What does it mean when a blue clock icon is displayed over the VS Code source control icon? When I run the git status command, I get the message: "nothing to commit, working tree clean." I checked the VS Studio documentation, but I couldn't find anything on this topic.

[![enter image description here][1]][1]


  [1]: https://i.stack.imgur.com/yRzPp.png

Meaning of clock icon in VS Code source control

If you get a message like this using the [**GitHub extension by KnisterPeter**][0]:

> To enable the Visual Studio Code GitHub Support, please set a Personal Access Token
>
> [![Enable Visual Studio Code GitHub Support][1]][1]


1. Go to *Settings* &rarr; *Developer Settings* &rarr; *Personal Access Token*

   Or go directly to *https://github.com/settings/tokens*

2. Click **Generate New Token**

   [![Settings -> Generate New Token][2]][2]

3. Go back to Visual Studio Code and open the *Command Palette* (<kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>)

4. Type in **GitHub: Set Personal Access Token**

   [![Set Personal Access Token][3]][3]

5. Paste in the value from your newly generated token

  [0]: https://marketplace.visualstudio.com/items?itemName=KnisterPeter.vscode-github
  [1]: https://i.stack.imgur.com/e5kof.png
  [2]: https://i.stack.imgur.com/h0SJX.png
  [3]: https://i.stack.imgur.com/pUg7f.png





I received [an email][1] saying GitHub will require token authentication after August 13 2021. I want to ensure I don't have an interruption of service (push/pull) after this date.
So I logged into GitHub and [created a token][2] for my single repository.

Now I want to use the token to push/pull my repository from GitHub, in Visual Studio Code, which uses Git and the command line, which I have installed on my Mac.

What do I do to add/replace the password from GitHub with the generated token I just created to push/pull from my repository? Can I do it from Visual Studio Code or does it get added from the terminal command line?

  [1]: https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/
  [2]: https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token




How to add a GitHub personal access token to Visual Studio Code

This seems to have something to do with IPv6 - you can disable it by doing the following:

1. Go to View **Network Connections**

    [![View Network Connections][1m]][1]

2. Right click on your current network and select **Properties**

    [![Network Properties][2m]][2]

3. **Deselect IPv6** Internet Prorotcol Version 6

    [![Internet Prorotcol Version 6][3m]][3]


  [1]: https://i.stack.imgur.com/NvLtv.png
  [2]: https://i.stack.imgur.com/hp5XO.png
  [3]: https://i.stack.imgur.com/RQE7I.png
  [1m]: https://i.stack.imgur.com/NvLtvm.png
  [2m]: https://i.stack.imgur.com/hp5XOm.png
  [3m]: https://i.stack.imgur.com/RQE7Im.png

I've been working with a repo in Azure for months without any issue, but recently started getting this error intermittently when I try to update my remotes or push/pull:

OpenSSL SSL_connect: Connection was reset in connection to dev.azure.com:443

If I keep retrying, it will eventually work. No idea what is causing this.

Things I've tried:
- Updated Git
- Turned off firewall
- Tried on a different computer with no issues