As [the documentation says](https://www.kernel.org/pub/software/scm/git/docs/git-stage.html), `git stage` is just a synonym for `git add`, so there is no difference in usage.

To add to [torek][1]&#39;s [answer][2], that synonym was introduced in [commit 11920d2 (git 1.6.1-rc2, Dec. 2008][3]) 

&gt; ## Add a built-in alias for &#39;`stage`&#39; to the &#39;`add`&#39; command

&gt; This comes from conversation at the GitTogether where we thought it would
be helpful to be able to teach people to &#39;stage&#39; files because it tends
to cause confusion when told that they have to keep &#39;add&#39;ing them.

&gt; This continues the movement to start referring to the index as a staging area (eg: the `--staged` alias to &#39;`git diff`&#39;). Also adds a doc file for &#39;`git stage`&#39; that basically points to the docs for &#39;`git add`&#39;.

----

That latter influenced the `git status` output, in [commit 8009d83, git 1.7.4-rc0, Nov 2010][4].  
The message &quot;`Changed but not updated`&quot; was rewritten into &quot;`Changes not staged for commit`&quot;

&gt; ##  Better &quot;`Changed but not updated`&quot; message in `git status`

&gt; Older Gits talked about &quot;updating&quot; a file to add its content to the index, but this terminology is confusing for new users.  
&quot;`to stage`&quot; is far more intuitive and already used in e.g. the &quot;`git stage`&quot; command name.

  [1]: https://stackoverflow.com/users/1256452/torek
  [2]: https://stackoverflow.com/a/34175877/6309
  [3]: https://github.com/git/git/commit/11920d28da1ac1b65eb4041c1b7355924e5d1366
  [4]: https://github.com/git/git/commit/8009d83c7e7af0a298ef858609a8201d01086396

I am trying to implement a [bittorrent tracker in Laravel][1]. However, I am stuck at the moment as the download won&#39;t start. There is one peer which it appears to be seeding and I am 100% sure that it is connectable. But, when I run a second client on a different machine, the download won&#39;t start. It is stuck at &quot;Connecting to peers&quot; (uTorrent).

From the tracker I am sending the following response when the client makes an announce:

    d8:intervali1000e12:min intervali300e5:peers18:�ؤ�i�ؑ�X&#218;JU�6e

In the downloading client I have the following data:

[![enter image description here][2]][2]
[![enter image description here][3]][3]

Here&#39;s my announce code:

    &lt;?php
    
    namespace App\Http\Controllers\Announce;
    
    use App\Helpers\BencodeHelper;
    use App\Models\Peer;
    use App\Models\PeerTorrent;
    use App\Models\Torrent;
    use App\Models\User;
    use Illuminate\Http\Request;
    use Illuminate\Http\Response;
    use Illuminate\Routing\Controller;
    use Illuminate\Support\Facades\Input;
    use Illuminate\Support\Facades\Log;
    
    class AnnounceController extends Controller
    {
        const __INTERVAL = 1000;
        const __TIMEOUT = 120;
        const __INTERVAL_MIN = 60;
        const __MAX_PPR = 20;
    
        public function announce(Request $request)
        {
            Log::info($request-&gt;fullUrl());
            $status = 200;
            $content = &quot;&quot;;
            $passkey = Input::get(&#39;passkey&#39;);
            $peer_id = Input::get(&#39;peer_id&#39;);
            $port = Input::get(&#39;port&#39;);
            $info_hash = Input::get(&#39;info_hash&#39;);
            $downloaded = Input::get(&#39;uploaded&#39;) ? intval(Input::get(&#39;uploaded&#39;)) : 0;
            $uploaded = Input::get(&#39;uploaded&#39;) ? intval(Input::get(&#39;uploaded&#39;)) : 0;
            $left = Input::get(&#39;left&#39;) ? intval(Input::get(&#39;left&#39;)) : 0;
            $compact = Input::get(&#39;compact&#39;) ? intval(Input::get(&#39;compact&#39;)) : 0;
            $no_peer_id = Input::get(&#39;no_peer_id&#39;) ? intval(Input::get(&#39;no_peer_id&#39;)) : 0;
    
            $ipAddress = &#39;&#39;;
            // Check for X-Forwarded-For headers and use those if found
            if (isset($_SERVER[&#39;HTTP_X_FORWARDED_FOR&#39;]) &amp;&amp; (&#39;&#39; !== trim($_SERVER[&#39;HTTP_X_FORWARDED_FOR&#39;]))) {
                $ipAddress = (trim($_SERVER[&#39;HTTP_X_FORWARDED_FOR&#39;]));
            } else {
                if (isset($_SERVER[&#39;REMOTE_ADDR&#39;]) &amp;&amp; (&#39;&#39; !== trim($_SERVER[&#39;REMOTE_ADDR&#39;]))) {
                    $ipAddress = (trim($_SERVER[&#39;REMOTE_ADDR&#39;]));
                }
            }
    
            $port = $_SERVER[&#39;REMOTE_PORT&#39;];
            /*if(!$port || !ctype_digit($port) || intval($port) &lt; 1 || intval($port) &gt; 65535)
            {
                $content = BencodeHelper::track(&quot;Invalid client port.&quot;);
                $status = 401;
                return (new Response(AnnounceController::track($content), $status))
                    -&gt;header(&#39;Content-Type&#39;, $value);
            }
    
            if ($port == 999 &amp;&amp; substr($peer_id, 0, 10) == &#39;-TO0001-XX&#39;) {
                die(&quot;d8:completei0e10:incompletei0e8:intervali600e12:min intervali60e5:peersld2:ip12:72.14.194.184:port3:999ed2:ip11:72.14.194.14:port3:999ed2:ip12:72.14.194.654:port3:999eee&quot;);
            }*/
    
    
            if (!$passkey) {
                $content = BencodeHelper::track(&quot;Missing passkey.&quot;);
                $status = 401;
                return (new Response(AnnounceController::track($content), $status))
                    -&gt;header(&#39;Content-Type&#39;, $value);
            }
    
    
            $torrent = Torrent::getByInfoHash(sha1($info_hash));
            if (!$torrent || $torrent == null) {
                $content = &quot;Torrent not registered with this tracker.&quot;;
                $status = 404;
                return (new Response(AnnounceController::track($content), $status))
                    -&gt;header(&#39;Content-Type&#39;, $value);
            }
    
            $user = User::has(&#39;passkeys&#39;, &#39;=&#39;, $passkey)-&gt;get();
    
            if ($user == null) {
                $content = BencodeHelper::track(&quot;Invalid passkey.&quot;);
                $status = 401;
                return (new Response(AnnounceController::track($content), $status))
                    -&gt;header(&#39;Content-Type&#39;, $value);
            }
    
            $peer = Peer::getByHashAndPasskey(bin2hex($peer_id), $passkey);
    
            if ($peer == null) {
                $peer = Peer::create([
                    &#39;hash&#39; =&gt; bin2hex($peer_id),
                    &#39;user_agent&#39; =&gt; $_SERVER[&#39;HTTP_USER_AGENT&#39;],
                    &#39;ip_address&#39; =&gt; $ipAddress,
                    &#39;passkey&#39; =&gt; $passkey,
                    &#39;port&#39; =&gt; $port
                ]);
            }
    
            if (!$info_hash || strlen($info_hash) != 20) {
                $content = BencodeHelper::track(&quot;Invalid info_hash.&quot;);
                $status = 401;
                return (new Response(AnnounceController::track($content), $status))
                    -&gt;header(&#39;Content-Type&#39;, $value);
            }
    
    
            $peer_torrent = PeerTorrent::getByPeerAndTorrent($peer, $torrent);
    
            if ($peer_torrent == null) {
                $peer_torrent = PeerTorrent::create([
                    &#39;peer_id&#39; =&gt; $peer-&gt;id,
                    &#39;torrent_id&#39; =&gt; $torrent-&gt;id,
                    &#39;uploaded&#39; =&gt; $uploaded,
                    &#39;downloaded&#39; =&gt; $downloaded,
                    &#39;left&#39; =&gt; $left,
                    &#39;stopped&#39; =&gt; false
                ]);
    
            } else {
                $peer_torrent-&gt;uploaded = $uploaded;
                $peer_torrent-&gt;downloaded = $downloaded;
                $peer_torrent-&gt;left = $left;
                $peer_torrent-&gt;save();
            }
    
            $seeders = $torrent-&gt;getSeedersCount();
            $leechers = $torrent-&gt;getLeechersCount();
            $resp = &quot;&quot;;
            if ($compact != 1) {
                $resp = &quot;d&quot; . $this-&gt;benc_str(&quot;interval&quot;) . &quot;i&quot; . AnnounceController::__INTERVAL . &quot;e&quot; . $this-&gt;benc_str(&quot;peers&quot;) . &quot;l&quot;;
            } else {
                $resp = &quot;d&quot; . $this-&gt;benc_str(&quot;interval&quot;) . &quot;i&quot; . AnnounceController::__INTERVAL . &quot;e&quot; . $this-&gt;benc_str(&quot;min interval&quot;) . &quot;i&quot; . 300 . &quot;e5:&quot; . &quot;peers&quot;;
            }
    
            $peer = array();
    
            $peer_num = 0;
            foreach ($torrent-&gt;getPeersArray() as $row) {
                if ($compact != 1) {
                    if ($row[&quot;peer_id&quot;] === $peer-&gt;hash) {
                        continue;
                    }
    
                    $resp .= &quot;d&quot; . $this-&gt;benc_str(&quot;ip&quot;) . $this-&gt;benc_str($row[&#39;ip&#39;]);
    
                    if ($no_peer_id == 0) {
                        $resp .= $this-&gt;benc_str(&quot;peer id&quot;) . $this-&gt;benc_str($row[&quot;peer_id&quot;]);
                    }
    
                    $resp .= $this-&gt;benc_str(&quot;port&quot;) . &quot;i&quot; . $row[&quot;port&quot;] . &quot;e&quot; . &quot;e&quot;;
    
                } else {
                    $peer_ip = explode(&#39;.&#39;, $row[&quot;ip&quot;]);
                    $peer_ip = pack(&quot;C*&quot;, $peer_ip[0], $peer_ip[1], $peer_ip[2], $peer_ip[3]);
                    $peer_port = pack(&quot;n*&quot;, (int)$row[&quot;port&quot;]);
                    $time = intval((time() % 7680) / 60);
    
                    if ($left == 0) {
                        $time += 128;
                    }
    
                    $time = pack(&quot;C&quot;, $time);
                    $peer[] = $time . $peer_ip . $peer_port;
                    $peer_num++;
                }
            }
    
            if ($compact != 1) {
                $resp .= &quot;ee&quot;;
            } else {
                $o = &quot;&quot;;
                for ($i = 0; $i &lt; $peer_num; $i++) {
                    $o .= substr($peer[$i], 1, 6);
                }
                $resp .= strlen($o) . &#39;:&#39; . $o . &#39;e&#39;;
            }
    
            $this-&gt;benc_resp_raw($resp);
        }
    
        public function benc_resp($d)
        {
            return $this-&gt;benc_resp_raw($this-&gt;benc(array(&#39;type&#39; =&gt; &#39;dictionary&#39;, &#39;value&#39; =&gt; $d)));
        }
    
        public function benc_resp_raw($x)
        {
            header(&quot;Content-Type: text/plain&quot;);
            header(&quot;Pragma: no-cache&quot;);
    
            if ($_SERVER[&#39;HTTP_ACCEPT_ENCODING&#39;] == &#39;gzip&#39;) {
                header(&quot;Content-Encoding: gzip&quot;);
                echo gzencode($x, 9, FORCE_GZIP);
            } else {
                echo $x;
            }
        }
    
        function benc($obj)
        {
            if (!is_array($obj) || !isset($obj[&quot;type&quot;]) || !isset($obj[&quot;value&quot;]))
                return;
            $c = $obj[&quot;value&quot;];
            switch ($obj[&quot;type&quot;]) {
                case &quot;string&quot;:
                    return $this-&gt;benc_str($c);
                case &quot;integer&quot;:
                    return $this-&gt;benc_int($c);
                case &quot;list&quot;:
                    return $this-&gt;benc_list($c);
                case &quot;dictionary&quot;:
                    return $this-&gt;benc_dict($c);
                default:
                    return;
            }
        }
    
        public function benc_str($s)
        {
            return strlen($s) . &quot;:$s&quot;;
        }
    
        public function benc_int($i)
        {
            return &quot;i&quot; . $i . &quot;e&quot;;
        }
    
        public function benc_list($a)
        {
            $s = &quot;l&quot;;
            foreach ($a as $e) {
                $s .= $this-&gt;benc($e);
            }
            $s .= &quot;e&quot;;
            return $s;
        }
    
        public function benc_dict($d)
        {
            $s = &quot;d&quot;;
            $keys = array_keys($d);
            sort($keys);
            foreach ($keys as $k) {
                $v = $d[$k];
                $s .= $this-&gt;benc_str($k);
                $s .= $this-&gt;benc($v);
            }
            $s .= &quot;e&quot;;
            return $s;
        }
    
    
        public function hex2bin($hex)
        {
            $r = &#39;&#39;;
            for ($i = 0; $i &lt; strlen($hex); $i += 2) {
                $r .= chr(hexdec($hex{$i} . $hex{($i + 1)}));
            }
            return $r;
        }
    }

I am not quite sure what am I missing here.


  [1]: https://github.com/Comforse/laratracker
  [2]: http://i.stack.imgur.com/ix44c.png
  [3]: http://i.stack.imgur.com/5vFNp.png

BitTorrent: Download not starting

I use the PyCharm IDE which assists with crafting PEP0257-compliant docstrings. It provides two attributes I don&#39;t entirely understand the distinction/use between:

 - `:raise Exception: exception explanation here`
 - `:raises Exception: exception explanation here`

When would I use `raise` as opposes to `raises` in my docstring? Specifically, if a class required an argument that was not provided and raises a `TypeError`, which should be used to document that?

Python Docstring: raise vs. raises

What is the difference between ```git add filename``` and ```git stage filename```? Because when I tried them both it looks that they do the same thing. 

Differencies between git add and git stage command

<p>What is the difference between <code>git add filename</code> and <code>git stage filename</code>? Because when I tried them both it looks that they do the same thing.</p>


I am trying to figure out how to use git-lfs. I use a gitlab EE server.

Maybe I missed something, but I failed to find any documentation on git-lfs beyond very short tutorial introducing the &quot;track&quot; command and cute 1 minute videos.

For example, I add and track a 3.7GB tar file in a repo, and push it:

    git lfs track &quot;*.tar&quot;
    cp &lt;a folder&gt;/a.tar .
    git add a.tar 
    git commit -m &quot;add a.tar&quot;
    git push origin master

**Question 1**: at the end of this process, has a.tar been uploaded on the gitlab server ? It is unclear as the &quot;add&quot; and the &quot;commit&quot; commands took some time (maybe not long enough to let me wonder if the 3.7GB were uploaded during that time) but the push did not take any time at all (a fraction of second).

**Question 2**: if the file was uploaded on the server, where ? Obviously not in the same place as the repo (that is the point). I asked because my server is being backed-up, and I need to know if the use of git-lfs requires me to update this in any way.

**Question 3**: if the file was not uploaded, does this mean other users of the repo will get the link to the file on the original machine on which the file was added ? Is there a way to change this to a location on the server ? (back to question 2)

**Question 4**: after cloning the repo, indeed the full 3.4G file is not there, &quot;just&quot; a text file with the content:

    version https://git-lfs.github.com/spec/v1
    oid sha256:4bd049d85f06029d28bd94eae6da2b6eb69c0b2d25bac8c30ac1b156672c4082
    size 3771098624

This is of course awesome and the whole point. But what if access to the full file is required ? how to download it ?

I would be happy with either direct answer to this question or a link toward a proper documentation.


Where are git-lfs files stored?

If I&#39;m working on a branch and then realize I need to merge another branch into mine here is my current workflow (for this example lets say that I&#39;m working on my-branch and want to merge in master):

    git stash
    git checkout master
    git pull
    git checkout my-branch
    git merge master
    git stash pop

Is there a way in git to pull a branch other than the currently checked out one, or is there a better way to do this?

For example, here&#39;s what I&#39;d like to be able to do (again lets say I&#39;m on my-branch and want to merge in `master`):

    git pull master
    git merge master

The git-pull man page says that a git pull is just a get fetch followed by a git merge, so is there a way to do the merge part of the git pull on a branch other than the one that&#39;s currently checked out?  

Or is what I&#39;m asking for just not possible?

git pull on a different branch

I started using [Visual Studio Code][1], and I was trying to save my test project into [GitHub][2], but Visual Studio Code is always asking for my GitHub credentials.

I have installed in my PC [GitHub Desktop][3] and also [Git][4]. I already ran:

     git config --global credential.helper wincred

but still Visual Studio Code is asking for the credentials.

How can I fix this?

Here is my **.gitconfig** file located in the user profile folfer:

        [filter &quot;lfs&quot;]
        clean = git-lfs clean %f
        smudge = git-lfs smudge %f
        required = true
    [user]
        name = ddieppa
    [user]
        email = fake@live.com
    [credential]
        helper = wincred

Here is the popup windows asking for the credentials:

[![Enter image description here][5]][5]

I enter my GitHub credentials in the popup, but still getting this error in the Git output window in Visual Studio Code:

    remote: Anonymous access to ddieppa/LineOfBizApp.git denied.
    fatal: Authentication failed for &#39;https://github.com/ddieppa/LineOfBizApp.git/&#39;

  [1]: https://code.visualstudio.com/
  [2]: https://github.com/
  [3]: https://desktop.github.com/
  [4]: https://git-scm.com/
  [5]: http://i.stack.imgur.com/l5SIE.png







Visual Studio Code is always asking for Git credentials

I have a git repo, where we apply many patches in test environment.

    git apply --stat --check --ignore-whitespace /home/kent/Desktop/patches/test.patch --exclude .gitignore

    git am -s --ignore-whitespace /home/kent/Desktop/patches/test.patch --exclude .gitignore --exclude .gitignore

If I have to remove the patch and apply a new one, at present I clone the live content and reapply all the test patches and push again.
This process is somehow cumbersome and also leads to errors at times I also miss one or two patches.

I wanted to know if there is a way to remove a patch and apply the new one

Also, to add one way is there if we commit each time to the patch and then i can use:

    git revert &lt;&lt;commit id&gt;&gt;

The above does not work for me at all times.

How can I remove an applied git patch?

My local laptop is a Mac.

1. The ssh key is configured properly. This is the content of ~/.ssh/config
```
Host barthea
Hostname git-codecommit.us-east-1.amazonaws.com
User AVVVVVVVVVVVVVVVVVQ
IdentityFile ~/.ssh/aws-aws.pem
```

Running ssh barthea gets me

    You have successfully authenticated over SSH. You can use Git to interact with AWS CodeCommit. Interactive shells are not supported.Connection to git-codecommit.us-east-1.amazonaws.com closed by remote host.

2. I created an IAM user bruce666 complete with password and access keys, made this user part of the &quot;team&quot; group.Then I created a policy that includes &quot;AWSCodeCommitPowerUsers&quot; and assigned this policy to &quot;team&quot;.  And finally assigned bruce666 to &quot;team&quot;. At this point, bruce666 can access any repo in CodeCommit through the management console.

3. I ran **aws config --profile bruce666**, fed in his access and secret key, his region and specified the format at json. At this point, I was able to create the rekha repo in CodeCommmit by running **aws codecommit get-repository --repository-name rekha --profile bruce666**

4. I can create a couple of dummy files, run **git init**, **git add .** , **git commit -m &quot;1&quot;**, **git add origin https://git-gitcode.amzonaws.com/repos/v1/rekha** , **git push -u origin master** And that operation will be successful.

5. However, when I run **git clone ssh://git-gitcode.amazonaws.com/repos/v1/rekha** , I get &quot;fatal: unable to access &#39;https://git-codecommit.us-east-1.amazonaws.com/v1/repos/barthia/&#39;: The requested URL returned error: 403&quot; What gives?

   



Content Type	Original Author	Original Content on Stackoverflow
Question	user3053231	View Question on Stackoverflow
Solution 1 - Git	torek	View Answer on Stackoverflow
Solution 2 - Git	VonC	View Answer on Stackoverflow

Differencies between git add and git stage command

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Python Docstring: raise vs. raises

BitTorrent: Download not starting

Attributions