If you exit the editor with an error code, the rebase will be aborted.

To exit with an error code on vim, do

    :cq

See [here][1] and vimdoc [here][2].


  [1]: https://stackoverflow.com/questions/16595908/git-exit-vim-without-commiting
  [2]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#:cq

Just delete all the lines that are not comments from the file. Then save it to the default supplied path and exit the editor.

As a result git will just do nothing in this rebase.

To delete all lines in vim you can use

    :%d|x

Then save and quit.

[delete all lines of file in Vim][1]

https://stackoverflow.com/q/11828270/#11828573

https://stackoverflow.com/q/3249275/#3249303

[1]:http://choorucode.com/2011/04/18/how-to-delete-all-lines-of-file-in-vim

If you&#39;re using Notepad++ on Windows for instance:

&lt;kbd&gt;Ctrl&lt;/kbd&gt;&lt;kbd&gt;A&lt;/kbd&gt; to select everything, then &lt;kbd&gt;Del&lt;/kbd&gt; or &lt;kbd&gt;Backspace&lt;/kbd&gt; to delete and &lt;kbd&gt;Ctrl&lt;/kbd&gt;&lt;kbd&gt;S&lt;/kbd&gt; save. Git will abort the rebase if the file is empty.

You may also hit &lt;kbd&gt;Ctrl&lt;/kbd&gt;&lt;kbd&gt;C&lt;/kbd&gt; in the command prompt where git is running to stop the current rebase command. Then run `git rebase --abort` to revert it.

Delete all text in your text editor screen, then save the file with the default supplied path.

Amazon announced AWS Lambda (http://aws.amazon.com/lambda/).

The product description includes:

&gt; **Scheduled Tasks**
&gt; 
&gt; AWS Lambda functions can be triggered by external event timers, so
&gt; functions can be run during regularly scheduled maintenance times or
&gt; non-peak hours. For example, you can trigger an AWS Lambda function to
&gt; perform nightly archive cleanups during non-busy hours.

When I read this, I understood I could finally have a way to consistently do &quot;cron-like&quot; tasks. I want to run a specific query everyday at 5PM let&#39;s say.

However I do not find this anywhere in the documentation. They only mention triggers on programatical events, or events from other AWS services.

Did I misunderstand? Or can someone point me to the documentation?

AWS Lambda Scheduled Tasks

I would like to set the initial viewcontroller from the appdelegate. I found a really good answer, however it&#39;s in Objective C and im having trouble achieving the same thing in swift.



https://stackoverflow.com/questions/10428629/programatically-set-the-initial-view-controller-using-storyboards

    - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
    {
        self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
        
        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@&quot;MainStoryboard&quot; bundle:nil];
        
        UIViewController *viewController = // determine the initial view controller here and instantiate   it with [storyboard instantiateViewControllerWithIdentifier:&lt;storyboard id&gt;];
        
        self.window.rootViewController = viewController;
        [self.window makeKeyAndVisible];
        
        return YES;
    }



Anyone able to  help?

I want the initial Viewcontroller to be dependent on certain conditions being met using a conditional statement.

set initial viewcontroller in appdelegate - swift

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

When I do an interactive rebase, e.g.
<pre><code class="hljs language-css">git rebase -i HEAD~3
</code></pre>
the rebase interactive editor (vim in my case) opens to let me edit the commits to rebase
<pre><code class="hljs language-sql">pick c843ea2 Set Vim column limit to 80 (OS X)
pick fc32eac Add Bash alias for `pbcopy` (OS X)
....
</code></pre>
If I now decide that I want to abort the rebase and quit vim using <code>:q</code> the rebase starts anyway. I'm using git version <code>1.9.0.msysgit.0</code> on windows.
Sure I can just delete all <code>pick</code> 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?

When doing a shallow clone in git (using the `--depth` option), the root commit is marked as *grafted*.

![enter image description here][1]

Googling didn&#39;t lead to any satisfacting documentation.

It doesn&#39;t seem to have anything to do with [git grafts](https://git.wiki.kernel.org/index.php/GraftPoint), which the similar terminology would imply.  
Is it just a flag to signal that this commit actually has more parents and isn&#39;t the &quot;real&quot; root commit? Or is there something more special about it?

  [1]: http://i.stack.imgur.com/dZlsX.png

What exactly is a &quot;grafted&quot; commit in a shallow clone?

How can i get a list of all the git commits done to the master branch between 2014-01-01 and 2014-06-30?

I know `git log` will give me roughly this format (repeated for all commits):
   
    commit &lt;hash&gt;
    author: &lt;author name&gt;
    date: &lt;date&gt;
    &lt;comment&gt;

But how can it be limited to selected dates and a one line per commit format?

    &lt;hash&gt; &lt;author&gt; &lt;date&gt;
    &lt;hash&gt; &lt;author&gt; &lt;date&gt;

List git commits to master branch between two dates

I am using a local git repo. When I try to commit changes to the core data model file (.xcdatamodel), I get this message:

    error: pathspec &#39;.../DataModel.xcdatamodeld/DataModel.xcdatamodel/contents&#39; did not match any file(s) known to git.

How to fix this and commit the model as I do with any other file?


Xcode - error: pathspec &#39;...&#39; did not match any file(s) known to git

Using Git version 2.2.0 with unity game engine on OS X, and wanted to commit my code.  I added everything and did not get an error message.  then commit -m , and got this error message:

    fatal: multiple stage entries for merged file &#39;Assets/Prefabs/Resources&#39;

Not noticing it I pushed, that didn&#39;t give an error message, in fact said `Everything up-to-date`
So I checked bitbucket (where the repo is held) and it didn&#39;t show my commit.  so I checked my local log and that also does not show my commit.

I&#39;ve looked into google for an answer... and nothing. what is this error? and how can I fix it?

Getting a fatal error in git for multiple stage entries

I&#39;m sure this is a very silly question, but I searched here and online and couldn&#39;t find an answer. 
I have a project setup in intellij to some git server, I just want to see the details (e.g. to send to someone else the URL so they can clone etc...) how do I simply display the current project&#39;s git remote settings **within Intellij IDEA, not using the command line**? (version 14)

Or do I have to go to the command line for that? (I know how to do it in the git command line)

How do I see my git remote url?

In  my case, I have two files file1 and file2. Using vimdiff, I want to merge the changes as follows:

1. In first difference, place line from file1 above line from file2. It means difference such as `Listing 2` in file2 and `List 2` should be `List 2` followed by `Listing 2` in the merged file.
2. Reverse case in another change.

Snapshot is shown below.

![enter image description here][1]

How can we achieve this using vimdiff?


  [1]: http://i.stack.imgur.com/tAppj.png

Merge changes using vimdiff

How do you quit all windows with a single command in Vim or `vimdiff`?

`:q` only quits out of the active window, so then a separate `:q` is needed to close each window.

  [1]: https://stackoverflow.com/search?q=vim%20quit%20all%20windows


How do I quit/exit all windows/buffers/splits/tabs at once in Vim or vimdiff?

I have installed IntelliJIdea 14.0.2 just now. I do not know its default editor but it is opening my source files in `vi` option now. So, not letting me do default action like `Ctrl + v`, `Ctrl + d` which was present before and I used to like it.

So, how to change this behavior like present in `sublime - editors`?

how to change editor behavior in intellij idea

I have this:

    pick 887b66f add 222 Dziewiecsil to flowers new title
    pick dc331cb new name of beginning commit

And I want to get this:

    pick dc331cb new name of beginning commit
    pick 887b66f add 222 Dziewiecsil to flowers new title

Is there a way to do this in a quick way using keyboard shortcuts?

How do I swap two lines in vim?

I saw [vi-mode implementation](https://github.com/fish-shell/fish-shell/pull/1218) for fish shell, but I have no clue how to use it. Is there any tutorial available online describing basic functionality, e.g. how to switch modes?

How to use vi mode in fish shell?

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)?

I have noticed that the two blocks of following git commands have different behaviours and I don&#39;t understand why.

I have an `A` and a `B` branches that diverge with one `commit`

    ---COMMIT--- (A)
    \
     --- (B)

I want to rebase `B` branch on the lastest `A` (and have the commit on the `B` branch)

    ---COMMIT--- (A)
             \
              --- (B)

No problem if I do:

    checkout B
    rebase A

But if I do:

    checkout B
    rebase --onto B A

It doesn&#39;t work at all, nothing happens. I don&#39;t understand why the two behaviours are different.

PhpStorm GIT client uses the second syntax, and so seems to be completely broken, that&#39;s why I ask for this syntax issue.


Content Type	Original Author	Original Content on Stackoverflow
Question	René Link	View Question on Stackoverflow
Solution 1 - Git	Telmo Costa	View Answer on Stackoverflow
Solution 2 - Git	Zombo	View Answer on Stackoverflow
Solution 3 - Git	CodeManX	View Answer on Stackoverflow
Solution 4 - Git	mcandre	View Answer on Stackoverflow

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

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

set initial viewcontroller in appdelegate - swift

AWS Lambda Scheduled Tasks

Attributions