If it is VIM for Windows, you can do the following:

- enter your message following the presented guidelines
- press &lt;kbd&gt;Esc&lt;/kbd&gt; to make sure you are out of the insert mode
- then type `:wq`&lt;kbd&gt;Enter&lt;/kbd&gt; or `ZZ`.

Note that in VIM there are often several ways to do one thing. Here there is a slight difference though. `:wq`&lt;kbd&gt;Enter&lt;/kbd&gt; always writes the current file before closing it, while `ZZ`, `:x`&lt;kbd&gt;Enter&lt;/kbd&gt;, `:xi`&lt;kbd&gt;Enter&lt;/kbd&gt;, `:xit`&lt;kbd&gt;Enter&lt;/kbd&gt;, `:exi`&lt;kbd&gt;Enter&lt;/kbd&gt; and `:exit`&lt;kbd&gt;Enter&lt;/kbd&gt; only write it if the document is *modified*.  
All these synonyms just have different numbers of keypresses.


I am assuming you are using msys git. If you are, the editor that is popping up to write your commit message is vim. Vim is not friendly at first. You may prefer to switch to a different editor. If you want to use a different editor, look at this answer: https://stackoverflow.com/questions/1634161/how-do-i-use-notepad-or-other-with-msysgit/1635493#1635493


If you want to use vim, type `i` to type in your message. When happy hit ESC. Then type `:wq`, and git will then be happy.

Or just type `git commit -m &quot;your message here&quot;` to skip the editor altogether.

Have you tried just going:
git commit -m &quot;Message here&quot;

So in your case:

    git commit -m &quot;Form validation added&quot;

After you&#39;ve added your files of course.

Typically, `git commit` brings up an interactive editor (on Linux, and possibly Cygwin, determined by the contents of your `$EDITOR` environment variable) for you to edit your commit message in.  When you save and exit, the commit completes.

You should make sure that the changes you are trying to commit have been added to the Git index; this determines what is committed.  See http://gitref.org/basic/ for details on this.

You can change the comment character to something besides # like this:

    git config --global core.commentchar &quot;@&quot;

How are everyday machines (not so much computers and mobile devices as appliances, digital watches, etc) programmed? What kind of code goes into the programming of a Coca-Cola vending machine? How does my coffee maker accept a pre-programmed time and begin brewing a pot of coffee hours later, when that time arrives?

Do these kinds of machines have operating systems inside of them, or is it something even more basic? Are they written in Assembly, C, or some other language?

And, I would really like to find some resource that lists these operating systems or underlying code systems, possibly even with source code if possible. If anyone knows of such a resource (searching yielded nothing for me), that would be fantastic.

How are everyday machines programmed?

Is there a simple method to convert any object to JSON in Android?

Convert object to JSON in Android

OS: Windows

I write

    $ git commit

then 

&gt; &quot;# Please enter the commit message&quot;

I write some text, like

&gt; &quot;Form validation added&quot;

Press Enter and not commited. Then i press Shift+Enter, Ctrl+Enter, Alt+Enter - still not commited.

I think its stupid trouble, but What i must to do?


Problems with entering Git commit message with Vim

OS: Windows
I write
<pre><code class="hljs language-ruby">$ git commit
</code></pre>
then
> "# Please enter the commit message"
I write some text, like
> "Form validation added"
Press Enter and not commited. Then i press Shift+Enter, Ctrl+Enter, Alt+Enter - still not commited.
I think its stupid trouble, but What i must to do?

    application/cache/*
    application/cache/folder/*
    application/cache/folder/onemorefolder/*

This doesn&#39;t seem to be working. When I clone the project, there is no `&quot;application/cache&quot;` folder or `&quot;application/cache/folder&quot;` folder, etc...

I&#39;d like if files in the cache folders weren&#39;t cached but folders were, so that the folders permissions transfer and exist.












.gitignore exclude files in directory but not certain directories

I have the following Git repository topology:

    A-B-F (master)
       \   D (feature-a)
        \ /
         C (feature)
          \
           E (feature-b)

By rebasing `feature` branch I expected to rebase the whole subtree (including child branches):

    $ git rebase feature master

    A-B-F (master)
         \   D (feature-a)
          \ /
           C (feature)
            \
             E (feature-b)

However, this is the actual result:

          C&#39; (feature)
         /
    A-B-F (master)
       \   D (feature-a)
        \ /
         C
          \
           E (feature-b)
I know I can easily fix it manually by executing:

    $ git rebase --onto feature C feature-a
    $ git rebase --onto feature C feature-b

But is there a way to automatically rebase branch including all its children/descendants?

Rebasing a branch including all its children

A new branch from `master` is created, we call it `test`.

There are several developers who either commit to `master` or create other branches and later merge into `master`.

Let&#39;s say work on `test` is taking several days and you want to continuously keep `test` updated with commits inside `master`.

I would do `git pull origin master` from `test`. 

**Question 1:** Is this the right approach?  Other developers could have easily worked on same files as I have worked btw.

-----------------------

My work on `test` is done and I am ready to merge it back to `master`. Here are the two ways I can think of:

**A:**  

    git checkout test
    git pull origin master
    git push origin test
    git checkout master
    git pull origin test 

**B:** 
 
    git checkout test
    git pull origin master
    git checkout master
    git merge test

I am not using `--rebase` because from my understanding, rebase will get the changes from `master` and stack mine on top of that hence it could overwrite changes other people made.

**Question 2:** Which one of these two methods is right?  What is the difference there?

The goal in all of this is to keep my `test` branch updated with the things happening in `master` and later I could merge them back into `master` hoping to keep the timeline as linear as possible.

What is the best (and safest) way to merge a Git branch into master?

I just want to get a list of changed files between two revisions, which is simple:

    git diff -–name-only commit1 commit2 &gt; /path/to/my/file

But, what should I write, if I want copy all that listed files to another place? And I need completely identical directory structure for copied files.

For example, I have modified and added files:

    /protected/texts/file1.txt
    /protected/scripts/index.php
    /public/pics/pic1.png

I want to have in `/home/changes/` all those changed and added files:

    /home/changes/protected/texts/file1.txt
    /home/changes/protected/scripts/index.php
    /home/changes/public/pics/pic1.png





Git diff --name-only and copy that list

I have a repository on github, and someone else has forked it and made changes.

I want to:

1. Create a new branch
2. Merge their changes into my branch

I have created the new branch:

    git commit -b my_new_branch

How do I merge their code into this new branch? 

This is the branch that I have created: https://github.com/poundifdef/VirginMobileMinutesChecker/tree/widget_toast

This is the branch that I want to merge:
https://github.com/xbakesx/VirginMobileMinutesChecker

What is the best way to do this? I&#39;ve tried a &quot;pull&quot; and it won&#39;t work. I honestly have no idea what I&#39;m doing in gitland, so if there is a better way to accomplish this (besides my creating a branch and trying to merge) then I am all ears!

Git merge from someone else&#39;s fork

This question pertains not only to how to accomplish this task, but to whether doing so is good or bad practice with Git.

Consider that locally I do most work on the master branch, but I have created a topical branch I will call &quot;topical_xFeature&quot;. In the process of working on &quot;topical_xFeature&quot; and switching back and forth to do other work on the master branch, it turns out that I have made more than one commit on the &quot;topical_xFeature&quot; branch, but between each commit, I have done no push.

**First**, would you consider this bad practice? Would it not be wiser to stick with one commit per branch per push? In what cases would it be good to have multiple commits on a branch before a push is made?

**Second**, how shall I best accomplish bringing the multiple commits on the topical_xFeature branch into the master branch for a push? Is it a nuisance to not worry about it and just do the push where multiple commits get pushed, or is it less annoying to somehow merge the commits into one and then push? Again, how to do this?

Combining Multiple Commits Into One Prior To Push

I&#39;m running into conflicts while trying to merge upstream changes back into my branch and I&#39;m not sure how to resolve them.

I created my own fork. I cloned it. I made changes to the branch on my fork, committed, and pushed. But then the main fork updated, and I tried to update my own fork by merging upstream in like so:

    $ cd repo-name
    $ git remote add upstream git://github.com/username/repo-name.git
    $ git fetch upstream
    $ git merge upstream/master

The merge says that there&#39;s some problem with a file and auto-merging doesn&#39;t work. It tells me to fix it myself and re-merge. So I actually went to the (upstream) repository on GitHub of the main fork and copied all the code of the new file into the file on my fork, and tried to merge again. Then, git gives me this error:

&gt; fatal: &#39;merge&#39; 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 and make a commit, or use &#39;git commit -a&#39;.

Is there some argument I&#39;m leaving out? Am I doing something stupid? What does it mean by &quot;unmerged files?&quot; Isn&#39;t the whole point of merging to merge files? Do I have to commit my changes before I merge?

Trouble merging upstream changes back into my branch

I ran a `git pull` that ended in a conflict. I resolved the conflict  and everything is fine now (I used mergetool also).

When I commit the resolved file with `git commit file.php -m &quot;message&quot;` I get the error:

    fatal: cannot do a partial commit during a merge.

I had the same issue before and using `-a` in commit worked perfectly. I think it&#39;s not the perfect way because I don&#39;t want to commit all changes. I want to commit files separately with separate comments. How can I do that? Why doesn&#39;t git allow users to commit files separately after a merge? I could not find a satisfactory answer to this problem.


Git error on commit after merge - fatal: cannot do a partial commit during a merge

OK, so I&#39;m getting an error sometimes when I try to revert a commit (with Git). All that I do is

`git revert &lt;commit hash&gt;`

and it gives me this message:

    error: could not revert &lt;commit hash&gt; &lt;commit message&gt;
    hint: after resolving the conflicts, mark the corrected paths
    hint: with &#39;git add &lt;paths&gt;&#39; or &#39;git rm &lt;paths&gt;&#39;

Does this mean that I should use `git mergetool` and resolve any conflicts? Once I do this can I add/rm and then commit, and the revert is complete?

What should I do when git revert aborts with an error message?

What is the difference between git `add`, `push` and `commit`?

Just a little confused coming from SVN, where &quot;update&quot; will &#39;add&#39; stuff, and commit does a &quot;push&quot; and will &#39;add&#39; as well

There are all different functions within git. Hoping for some explanation from your experience.

Git: add vs push vs commit

How can I commit changes without specifying commit message? Why is it required by default?

Git commit with no commit message

I am using the hub- feature of SignalR (https://github.com/SignalR/SignalR) to publish messages to all subscribed clients:

    public class NewsFeedHub : Hub
    public void Send(string channel, string content)
    {
        Clients[channel].addMessage(content);
    }

This works fine when calling &quot;Send&quot; via Javascript, but I would also like the web application to publish messages (from within an ASP.NET MVC action method). I already tried instantiating a new object ob NewsFeedHub and calling the Send method, but this results in an error (as the underlying &quot;Connection&quot; of the Hub is not set). Is there a way to use the Hub without a connection?

SignalR + posting a message to a Hub via an action method

I have a package in R (ROCR) that I need to load in my R environment.  Upon loading the package, a set of messages are printed.  This is ordinarily fine, but since the output of my R script is being used for further analysis I want to completely disable all of this output.  How do I do that?  Furthermore, I&#39;d prefer to do it without having to modify ROCR at all, so that future users of this script don&#39;t have to do that either.

So far:

 - `sink()` doesn&#39;t work here - redirecting both stdout and std err to `/dev/null` does nothing for me.
 - Unsurprisingly, `options(warnings=-1)` does nothing either, since these are not warnings, per se, being printed.

Any thoughts?

Disable messages upon loading a package

After much searching I couldn&#39;t find out how to use smtplib.sendmail to send to multiple recipients.  The problem was every time the mail would be sent the mail headers would appear to contain multiple addresses, but in fact only the first recipient would receive the email.

The problem seems to be that the [`email.Message`][1] module expects something different than the [`smtplib.sendmail()`][2] function.

In short, to send to multiple recipients you should set the header to be a string of comma delimited email addresses.  The `sendmail()` parameter `to_addrs` however should be a list of email addresses.

    from email.MIMEMultipart import MIMEMultipart
    from email.MIMEText import MIMEText
    import smtplib

    msg = MIMEMultipart()
    msg[&quot;Subject&quot;] = &quot;Example&quot;
    msg[&quot;From&quot;] = &quot;me@example.com&quot;
    msg[&quot;To&quot;] = &quot;malcom@example.com,reynolds@example.com,firefly@example.com&quot;
    msg[&quot;Cc&quot;] = &quot;serenity@example.com,inara@example.com&quot;
    body = MIMEText(&quot;example email body&quot;)
    msg.attach(body)
    smtp = smtplib.SMTP(&quot;mailhost.example.com&quot;, 25)
    smtp.sendmail(msg[&quot;From&quot;], msg[&quot;To&quot;].split(&quot;,&quot;) + msg[&quot;Cc&quot;].split(&quot;,&quot;), msg.as_string())
    smtp.quit()
    


  [1]: http://docs.python.org/library/email.message.html#email.message.Message
  [2]: http://docs.python.org/library/smtplib.html#smtplib.SMTP.sendmail

How to send email to multiple recipients using python smtplib?

I have this `try` block in my code:

    try:
        do_something_that_might_raise_an_exception()
    except ValueError as err:
        errmsg = &#39;My custom error message.&#39;
        raise ValueError(errmsg)

Strictly speaking, I am actually raising _another_ `ValueError`, not the `ValueError` thrown by `do_something...()`, which is referred to as `err` in this case. How do I attach a custom message to `err`? I try the following code but fails due to `err`, a `ValueError` __instance__, not being callable:

    try:
        do_something_that_might_raise_an_exception()
    except ValueError as err:
        errmsg = &#39;My custom error message.&#39;
        raise err(errmsg)

Content Type	Original Author	Original Content on Stackoverflow
Question	aTei	View Question on Stackoverflow
Solution 1 - Git	mousio	View Answer on Stackoverflow
Solution 2 - Git	Matt Greer	View Answer on Stackoverflow
Solution 3 - Git	Tony	View Answer on Stackoverflow
Solution 4 - Git	Emil Sit	View Answer on Stackoverflow
Solution 5 - Git	Matt Spradley	View Answer on Stackoverflow

Problems with entering Git commit message with Vim

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Solution 5 - Git

Convert object to JSON in Android

How are everyday machines programmed?

Attributions