&gt; What will happen if I use git pull --rebase ?

`git pull --rebase` is roughly equivalent to

    git fetch
    git rebase origin/master

i.e. your remote changes (`C`) will be applied before the local changes (`D`), resulting in the following tree

    A -- B -- C -- D


----------


&gt; What will happen if I use git pull --ff-only ?

It will fail.

`git pull --ff-only` corresponds to

    git fetch
    git merge --ff-only origin/master

`--ff-only` applies the remote changes only if they can be fast-forwarded. From the man:

&gt; Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward

Since your local and remote branches have diverged, they cannot be resolved by a fast-forward and `git pull --ff-only` would fail.



In my node app, I am using express. all works fine, But i am getting error in the `cmd`. I use all are updated modules...

**my code :**

    var express = require(&#39;express&#39;);
    var bodyParser = require(&#39;body-parser&#39;);
    var jade = require(&#39;jade&#39;);
    var app = express();
    app.set(&#39;view engine&#39;, &#39;jade&#39;);
    app.set(&#39;views&#39;, __dirname + &#39;/views&#39;);
    app.use(express.static(__dirname + &#39;/public&#39;));
    
    
    app.use(bodyParser.json()); // to support JSON-encoded bodies
    app.use(bodyParser.urlencoded()); // to support URL-encoded bodies
    
    
    app.get(&#39;/&#39;,function(req,res){
    	res.render(&#39;index.jade&#39;);
    });
    
    app.get(&#39;/login&#39;,function(req,res){
    	res.render(&#39;index.jade&#39;);
    });
    
    app.post(&#39;/login&#39;,function(req,res){
    	console.log(req.body);
    });
    
    app.get(&#39;/signup&#39;,function(req,res){
    	res.render(&#39;signup.jade&#39;);
    });
    
    var env = process.env.PORT || 3000;
    
    
    app.listen(env, function(req, res){
    	console.log(&#39;i am working!&#39;);
    });



**Error:**

    D:\myLogin&gt;node app
    body-parser deprecated undefined extended: provide extended option app.js:11:20 //why i am getting this?
    i am working!
    { username: &#39;jbarif@gmail.com&#39;, password: &#39;pass&#39; } // i am getting response


Can any help me to understand this issue please?

express throws error as `body-parser deprecated undefined extended`

Specifically:
I am trying to use Julia&#39;s DataFrames package, specifically the readtable() function with the names option, but that requires a vector of symbols.

- what is a symbol?
- why would they choose that over a vector of strings?

So far I have found only a handful of references to the word symbol in the Julia language. It seems that symbols are represented by &quot;:var&quot;, but it is far from clear to me what they are.

Aside:
I can run

    df = readtable( &quot;table.txt&quot;, names = [symbol(&quot;var1&quot;), symbol(&quot;var2&quot;)] )

My two bulleted questions still stand.

What is a &quot;symbol&quot; in Julia?

Let&#39;s say `origin/master` has commit `A--B--C` and my `local/master` has commit `A--B--D`.


What will happen if I use `git pull --rebase` ?

What will happen if I use `git pull --ff-only` ?

Is there any difference in the resulting commit tree ?

Difference between git pull --rebase and git pull --ff-only

Let's say <code>origin/master</code> has commit <code>A--B--C</code> and my <code>local/master</code> has commit <code>A--B--D</code>.
What will happen if I use <code>git pull --rebase</code> ?
What will happen if I use <code>git pull --ff-only</code> ?
Is there any difference in the resulting commit tree ?

My `.gitignore` file isn&#39;t working for some reason, and no amount of Googling has been able to fix it. Here is what I have:

    *.apk
    *.ap_
    *.dex
    *.class
    **/bin/
    **/gen/
    .gradle/
    build/
    local.properties
    **/proguard/
    *.log

It&#39;s in the directory `master`, which is my git repo. I&#39;m running Git 1.8.4.2 because I&#39;m on a MacBook running OSX 10.8.6.

Gitignore not working

I  added over 9000 photos by accident to my project folder. And committed them. Then deleted them from disk. Committed. 

Now I try to push changes to git server. But it takes too long and tries to send 12 Gb of data. 

I checked files size on disk and see that really `.git` folder takes 12 Gb. 

**How to delete photos** from there? I tried `git rm`, but fails:

    ❯ git rm public/photos
    fatal: pathspec &#39;public/photos&#39; did not match any files

Because I allready deleted them from disk, but they are still in `.git` folder. 

I tried to add `public/photos` to `.gitignore`:

    public/photos/
    *.zip

But no result.
Of course I could `hard reset head` to moment when I did not have so many junk photos in my project. But since that time i committed many times and made a lot changes in code.  

git rm - fatal: pathspec did not match any files

I currently have an old SSH key uploaded on a server. The problem is I lost my `~/.ssh` directory (with the original `id_rsa` and `id_rsa.pub` files).

Consequently, I want to remove the old SSH key directly on the server and upload a new one.

I tried the following command without success:

    $&gt; ssh-add -D

![Enter image description here][1]

Is there a way to completely remove an SSH key?

  [1]: http://i.stack.imgur.com/TCNOE.png





How can I remove an SSH key?

I am very new to Git; I only recently created a GitHub account.

I&#39;ve just tried to push my very first repository (a sample project), but I&#39;m getting the following error:

    No such remote &#39;origin&#39;

I ran the following commands:

    git init
    git commit -m &quot;first commit&quot;
    git remote add origin https://github.com/VijayNew/NewExample.git
    git push -u origin master

However, when I ran git commit -m &quot;first commit&quot;, I got the following message:

    nothing added to commit but untracked files present (use &quot;git add&quot; to track)

So then I tried to set `origin`, using

    git remote set-url origin https://github.com/VijayNew/NewExample.git

But I got the following error:

    No such remote &#39;origin&#39;

What did I do wrong, and what should I do?

Why does Git tell me &quot;No such remote &#39;origin&#39;&quot; when I try to push to origin?

I have a project hosted on BitBucket

Can I rename it ?

If not and I need to create a new repository can someone tell me the easiest way to do that and have new repo on BitBucket (one particular cause of confusion for me is whether to drive the process locally or from the bitbucket website)

**Update**

Thankyou Rafal I&#39;ve followed your instructions and it works great but Im just going to make it a little clearer for noobies like myself (on linux)

1. In Bitbucket project settings rename project
2. vi projectname/.git/config and edit url value to reflect new bitbucket repository url
3. mv projectname newprojectname

Easiest way to rename git project configured on BitBucket

When I do an interactive rebase, e.g.

    git rebase -i HEAD~3

the rebase interactive editor (vim in my case) opens to let me edit the commits to rebase

    pick c843ea2 Set Vim column limit to 80 (OS X)
    pick fc32eac Add Bash alias for `pbcopy` (OS X)
    ....

If I now decide that I want to abort the rebase and quit vim using `:q` the rebase starts anyway. I&#39;m using git version `1.9.0.msysgit.0` on windows.

Sure I can just delete all `pick` lines, but it might be a lot to do if I rebase a longer history. Is there another way?

How can I quit the rebase interactive editor (vim) and abort the rebase?

How to abort a git rebase from inside vim during interactive editing

Suppose I am rebasing **experiment** branch on **master** and there are conflicts in files. And of course there are files deleted in both branches. So when I am resolving the conflicts, in `git status` I see `deleted by us` and `deleted by them`. Its very confusing. Is there any way of understanding what they mean? Who is **them** and who is **us**?

Or while rebasing is there another way to know which file was deleted by which branch? Like printing the branch name?

git rebase &quot;deleted by us&quot; and &quot;deleted by them&quot;

From what I read, both of them help us get a linear history. 

From what I experimented, rebase works all the time. But merge --ff-only works only in scenarios where it can be fast forwarded.

I also noticed, git merge creates a merge commit, but if we use --ff-only, it gives a linear history which essentially is equal to git rebasing. So --ff-only kills the purpose of git merge, right?

So what is the actual difference between them? 

Is there a difference between git rebase and git merge --ff-only

I&#39;m trying to script rebasing and my script will take different paths depending on if the rebase results in any conflicts.

Is there a way to determine if a rebase would result in conflicts before executing the rebase?

Is there some kind of &#39;git rebase --dry-run&#39;, which would notify me of conflicts in advance?

When I run:  

    git status

I see this:

    rebase in progress; onto 9c168a5
    You are currently rebasing branch &#39;master&#39; on &#39;9c168a5&#39;.
    (all conflicts fixed: run &quot;git rebase --continue&quot;)
    nothing to commit, working directory clean

When I do: 

    ls `git rev-parse --git-dir` | grep rebase || echo no rebase

I see: rebase-apply

I can&#39;t commit to origin. 

    git branch

Shows:

    * (no branch, rebasing master)
      develop
      master

I&#39;m stuck. I don&#39;t know what to do? Does it really take this long to rebase? `git rebase --continue` doesn&#39;t do anything. I don&#39;t have anything in git status.. I&#39;m just waiting for the rebase. What can I do?

UDATE:
This is the output of: git rebase --continue

    Applying: no message
    No changes - did you forget to use &#39;git add&#39;?
    If there is nothing left to stage, chances are that something else
    already introduced the same changes; you might want to skip this patch.
    
    When you have resolved this problem, run &quot;git rebase --continue&quot;.
    If you prefer to skip this patch, run &quot;git rebase --skip&quot; instead.
    To check out the original branch and stop rebasing, run &quot;git rebase --abort&quot;.

git add . has nothing. 

rebase in progress. Cannot commit. How to proceed or stop (abort)?

When I try to pull in my project directory in the terminal, I see the following error:

    harsukh@harsukh-desktop:~/Sites/branch1$ git pull origin master
    U app/config/app.php
    U app/config/database.php
    U app/routes.php
    Pull is not possible because you have unmerged files.
    Please, fix them up in the work tree, and then use &#39;git add/rm &lt;file&gt;&#39;
    as appropriate to mark resolution, or use &#39;git commit -a&#39;.

Why does git say `&quot;Pull is not possible because you have unmerged files&quot;`, and how can I resolve it?

Why does git say &quot;Pull is not possible because you have unmerged files&quot;?

I am working on a site with a server running Git. I am using Git for deployment (not GitHub). This was set up prior to my involvement using a [hook method][1], and I referred to [this question][2] and entered the commands below, but it didn&#39;t work.

How do I pull a single file from the server? For instance, if I wanted to update my local file index.php? `git pull index.php`?

  [1]: https://danbarber.me/using-git-for-deployment/
  [2]: https://stackoverflow.com/questions/11245424/pull-single-file-on-server


Git: How to pull a single file from a server repository in Git?

I accidentally did a `git pull origin master` from dev, and master got merged into dev.
Is it possible to unmerge?

I&#39;ve already seen different solutions, i tried this one from both dev and master :
 `git revert -m 1 &lt;commit&gt;` (once each)
But i got : Everything is up-to-date, each time


How to unmerge a Git merge?

I know how to solve this:

    user@host$ git pull
    Updating 9386059..6e3ffde
    error: Your local changes to the following files would be overwritten by merge:
    	foo.bar
    Please, commit your changes or stash them before you can merge.
    Aborting

But isn&#39;t there a way to let `git pull` do the `stash` and `pop` dance for me?

If this command has a different name, it&#39;s ok.

Creating a shell alias for `git stash; git pull; git stash pop` is a solution, but I search for a better solution.


Can &quot;git pull&quot; automatically stash and pop pending changes?

I&#39;ve been using github from a relatively short period, and I&#39;ve always used the client to perform commits and pulls. I decided to try it from the git bash yesterday, and I successfully created a new repo and committed files.

Today I did changes to the repository from another computer, I&#39;ve committed the changes and now I&#39;m back home and performed a `git pull` to update my local version and I get this:

    There is no tracking information for the current branch.
        Please specify which branch you want to merge with.
        See git-pull(1) for details
    
        git pull &lt;remote&gt; &lt;branch&gt;
    
    If you wish to set tracking information for this branch you can do so with:
    
        git branch --set-upstream develop origin/&lt;branch&gt;

the only contributor to this repo is me and there are no branches (just a master). I&#39;m on windows and I&#39;ve performed the pull from git bash:

[![enter image description here][1]][1]

git status:

    $ git status
    # On branch master
    nothing to commit, working directory clean

git branch:

    $ git branch
    * master

What am I doing wrong?

 


  [1]: https://i.stack.imgur.com/AeyH8.png

Content Type	Original Author	Original Content on Stackoverflow
Question	Nico	View Question on Stackoverflow
Solution 1 - Git	Gabriele Petronella	View Answer on Stackoverflow

Difference between git pull --rebase and git pull --ff-only

Git Problem Overview

Git Solutions

Solution 1 - Git

What is a "symbol" in Julia?

express throws error as `body-parser deprecated undefined extended`

Attributions