This is vim, it&#39;s a common unix editor

press:

    :wq

that&#39;s it. (w=write q=quit)

When you see this, an editor already opened, because you see this ;) I guess it opens `vi`, or a derivate of this. Google for it to find out how to use it, but it seems you prefer to change the editor instead

    git config --global core.editor &quot;emacs&quot;

I prefer `nano` :) 

How can one get the name and line of a function that called the current one? I would like to have a rudimentary debugging function like this (with [npmlog](https://github.com/isaacs/npmlog) defining `log.debug`):

    function debug() {
      var callee, line;
      /* MAGIC */
      log.debug(callee + &quot;:&quot; + line, arguments)
    }

When called from another function it would be something like this:
   
    function hello() {
       debug(&quot;world!&quot;)
    }
    // outputs something like:
    // &quot;hello:2 &#39;world!&#39;&quot;

For clarity, what I want is essentially analogous to [this in Python][1]:

    import inspect
    def caller():
        return inspect.stack()[2][3]
    // line no from getframeinfo().lineno

Is there a Node equivalent to accomplish this?

  [1]: https://stackoverflow.com/questions/2654113

Get name and line of calling function in node.js

I have an angular template which looks like this...

    &lt;div ng-repeat=&quot;message in data.messages&quot; ng-class=&quot;message.type&quot;&gt;
        
        &lt;div class=&quot;info&quot;&gt;
            &lt;div class=&quot;type&quot;&gt;&lt;/div&gt;
            &lt;div class=&quot;from&quot;&gt;From Avatar&lt;/div&gt;
            &lt;div class=&quot;createdBy&quot;&gt;Created By Avatar&lt;/div&gt;
            &lt;div class=&quot;arrowTo&quot;&gt;
                &lt;div class=&quot;arrow&quot;&gt;&lt;/div&gt;
                &lt;div class=&quot;to&quot;&gt;To Avatar&lt;/div&gt;
            &lt;/div&gt;
            &lt;div class=&quot;date&quot;&gt;
                &lt;div class=&quot;day&quot;&gt;25&lt;/div&gt;
                &lt;div class=&quot;month&quot;&gt;Dec&lt;/div&gt;
            &lt;/div&gt;
        &lt;/div&gt;
    
        &lt;div class=&quot;main&quot;&gt;
            &lt;div class=&quot;content&quot;&gt;
                &lt;div class=&quot;heading2&quot;&gt;{{message.title}}&lt;/div&gt;
                &lt;div ng-bind-html=&quot;message.content&quot;&gt;&lt;/div&gt;
            &lt;/div&gt;
                                
        &lt;/div&gt;
                            
        &lt;br /&gt;
        &lt;hr /&gt;
        &lt;br /&gt;
                            
    &lt;/div&gt;



I have set up [a JSfiddle][1] to show the data being bound.

What I need to do is make the &quot;from&quot;, &quot;to&quot; and &quot;arrowTo&quot; divs show conditionally, depending on the content of the data.

The log is is this...

 - If there is a &quot;from&quot; object in the data then show the &quot;from&quot; div and bind the data but don&#39;t show the &quot;createdBy&quot; div .
 - If there is no &quot;from&quot; object but there is a &quot;createdBy&quot; object then show the &quot;createdBy&quot; div and bind the data.
 - If there is a &quot;to&quot; object in the data then show the &quot;arrowTo&quot; div and bind it&#39;s data.


Or in plain English, if there is a from address, show it, otherwise show who created the record instead and if there is a to address then show that too.

I have looked into using ng-switch but I think I&#39;d have to add extra markup which would leave an empty div if there was no data. Plus I&#39;d need to nest switch directives and I&#39;m not sure if that would work.

Any ideas?




**UPDATE:**

If I were to write my own directive (If I knew how!) then here is some pseudo code to show how I would want to use it...


    &lt;div ng-if=&quot;showFrom()&quot;&gt;
        From Template Goes Here
    &lt;/div&gt;
    &lt;div ng-if=&quot;showCreatedBy()&quot;&gt;
        CreatedBy Template Goes Here
    &lt;/div&gt;
    &lt;div ng-if=&quot;showTo()&quot;&gt;
        To Template Goes Here
    &lt;/div&gt;


Each of these would disappear if the function/expression evaluated to false.


  [1]: http://jsfiddle.net/jon64digital/pGwRu/1/

Conditional logic in AngularJS template

&gt; **Possible Duplicate:**  
&gt; [github locks up mac terminal when using pull command](https://stackoverflow.com/questions/14046122/github-locks-up-mac-terminal-when-using-pull-command)  

&lt;!-- End of automatically inserted text --&gt;

I am using git via the terminal on the mac.
I have encountered an annoying problem recently when I try to perform `git pull`.
After performing `git pull` I receive the following error message:

    Merge ssh://domain.com/repository.git
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with &#39;#&#39; will be ignored, and an empty message aborts:
    # the commit.

The issue is that I can&#39;t enter anything. My terminal seems stuck and there isn&#39;t anything I seem to be able to do about it. I am reasonably new to git so it may be a simple mistake I am making.

I read [here](https://stackoverflow.com/questions/11744081/why-is-git-prompting-me-for-a-post-pull-merge-commit-message) that for some people the text editor opens at this point. This certainly isn&#39;t the case at my end. It also states there that I can use the --no-edit flag to merge without a message, but even this does not seem to work at my end.

I am a bit clueless at the moment, stuck and unable to push any changes to my server.

git pull - can&#39;t submit merge message

> Possible Duplicate: 
> <a href="https://stackoverflow.com/questions/14046122/github-locks-up-mac-terminal-when-using-pull-command" target="_blank" rel="noopener noreferrer">github locks up mac terminal when using pull command</a>

I am using git via the terminal on the mac.
I have encountered an annoying problem recently when I try to perform <code>git pull</code>.
After performing <code>git pull</code> I receive the following error message:
<pre><code class="hljs language-bash">Merge ssh://domain.com/repository.git
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts:
# the commit.
</code></pre>
The issue is that I can't enter anything. My terminal seems stuck and there isn't anything I seem to be able to do about it. I am reasonably new to git so it may be a simple mistake I am making.
I read <a href="https://stackoverflow.com/questions/11744081/why-is-git-prompting-me-for-a-post-pull-merge-commit-message" target="_blank" rel="noopener noreferrer">here</a> that for some people the text editor opens at this point. This certainly isn't the case at my end. It also states there that I can use the --no-edit flag to merge without a message, but even this does not seem to work at my end.
I am a bit clueless at the moment, stuck and unable to push any changes to my server.

In last hour or so i have modified files 

    A
    ATest
    B
    BTest

In order to make sure my commit messages line up with the actual change, committed `A` with a description. Unfortunately i have not included `ATest` into that commit.

Meanwhile, still not committed are `B` and `BTest`. 

What is the best way to proceed at this point? I&#39;d like to either:

1. Revert previous commit without affecting my currently uncommitted files?
2. Add another file under the same description to the previous commit?

How to add file to a previous commit?

I&#39;m having trouble figuring out how to use `git blame` for getting the set of commits that *ever* touched a given range of lines. There are similar questions like [this one](https://stackoverflow.com/questions/5098256/git-blame-prior-commits) but the accepted answer doesn&#39;t bring me much further.  

Let&#39;s say I have a definition that starts on line 1000 of `foo.rb`. It&#39;s only only 5 lines long, but the number of commits that ever changed those lines is enormous. If I do

    git blame foo.rb -L 1000,+5
    
I get references to (at most) five distinct commits that changed these lines, but I&#39;m also interested in the commits &quot;behind them&quot;. 

Similarly,

    git rev-list HEAD -- foo.rb | xargs git log --oneline
    
is almost what I want, but I can&#39;t specify line ranges to `git rev-list`

Can I pass a flag to `git blame` to get the list of commits that ever touched those five lines, or what&#39;s the quickest way to build a script that extracts such information? Let&#39;s ignore for the moment the possibility that the definition once had more or less than 5 lines. 

Git: discover which commits ever touched a range of lines

I can&#39;t find the correct way to install a local directory as a python package using pip.

	(venv) C:\(...)&gt;pip install . --no-index
	Ignoring indexes: http://pypi.python.org/simple/
	Unpacking c:\users\fsantos\desktop\biskates.com\biskates\forks\django-pipeline
	  Running setup.py egg_info for package from file:///(...)%5Cforks%5Cdjango-pipeline
	
	Installing collected packages: django-pipeline
	  Running setup.py install for django-pipeline
	
	Successfully installed django-pipeline
	Cleaning up...

	(venv) C:\(...)&gt;cd ..
	(venv) C:\(...)&gt;python
	Python 2.7.2 (default, Jun 12 2011, 15:08:59) [MSC v.1500 32 bit (Intel)] on win32
	Type &quot;help&quot;, &quot;copyright&quot;, &quot;credits&quot; or &quot;license&quot; for more information.
	&gt;&gt;&gt; import pipeline
	&gt;&gt;&gt; pipeline.__file__
	&#39;C:\\(...)site-packages\\pipeline\\__init__.py&#39;
	&gt;&gt;&gt;

As you can see pip just copied over the package to site-packages. How can I avoid this, and use the package directly from its source folder?

I&#39;m trying to integrate django-pipeline into my Django project, but I want to add support for Django 1.4 first, so I forked and cloned my fork.

pip install a local git repository

I need to find a commit in Git by a given hash, SHA. For example, if I have the &quot;a2c25061&quot; hash, and I need to get the author and the committer of this commit. 

What is the command to get that?


How to find a commit by its hash?

I have two branches namely `master` and `development` in a GitHub Repository. I am doing all my  development in development branch as shown.

    git branch development
    git add *
    git commit -m &quot;My initial commit message&quot;
    git push -u origin development

Now I want to merge all the changes on the `development` branch into the `master`. My current approach is:

    git checkout master 
    git merge development
    git push -u origin master 

Please let me know if the procedure I am following is correct.

Merge development branch with master

In a larger git merge with several conflicting files, I incorrectly marked a file as resolved (using `git add FILE` after some editing)

Now I&#39;d like to undo my conflict resolution attempt and start over resolving that file.

How can I do that?

Restart/undo conflict resolution in a single file

Let&#39;s imagine that we have a `master` branch.

Then we create a `newbranch`

    git checkout -b newbranch

and make two new commits to `newbranch`: *commit1* and *commit2*

Then we switch to master and make `cherry-pick`

    git checkout master
    git cherry-pick hash_of_commit1

Looking into `gitk` we see that *commit1* and its cherry-picked version have different hashes, so technically they are two different commits.

Finally we merge `newbranch` into `master`:

    git merge newbranch

and see that these two commits with different hashes were merged without problems although they imply that the same changes should be applied twice, so one of them should fail.

Does git really do a smart analysis of commit&#39;s content while merging and decide that changes shouldn&#39;t be applied twice or these commits are marked internally as linked together?

How does git merge after cherry-pick work?

I&#39;ve read from various sources that it&#39;s usually a better idea to fetch *then* merge rather than simply pull as it allows for finer control.  That said, I&#39;ve yet to find actually how to do it.  Case in point:

There was a small change made to some of the code in one of my GitHub repository&#39;s master branch.  I was able to fetch it, but I don&#39;t know how to actually merge the differences in with *my* local master branch.  `git branch` lists all of the local branches I have, but nothing indicating anything to merge to.

So, is it just something like `git merge master` or `git merge origin/master`?  What am I missing?

Git merge after fetch - how, exactly?

I have a master branch and a working `branch_1`. I want to &#39;move&#39; `branch_1` exactly as it is to `master`. So I want something like this:

    git checkout master
    git merge branch_1 # I don&#39;t know what is correct...


Things which I did but I got loads of files messed up with annoying conflicts. So now master contains exactly the same files of `branch_1` avoiding any conflicts, just overwriting files.
Any help?

Git merge branch into master

How do I ignore the following error message on Git pull?

&gt; Your local changes to the following files would be overwritten by merge

What if I **want** to overwrite them?

I&#39;ve tried things like `git pull -f`, but nothing works.

To be clear, I only want to overwrite specific changes, not everything.



How do I ignore an error on &#39;git pull&#39; about my local changes would be overwritten by merge?

I have a colleague who claims that `git pull` is harmful, and gets upset whenever someone uses it.

The `git pull` command seems to be the canonical way to update your local repository.  Does using `git pull` create problems? What problems does it create? Is there a better way to update a git repository?

In what cases could `git pull` be harmful?

Is there a difference between `git rebase upstream/master` and `git pull --rebase upstream master`, and if so, what? The remote could be any remote, not necessarily upstream.

git rebase upstream/master vs git pull --rebase upstream master

I am working on a Git branch that has some broken tests, and I would like to pull (merge changes, not just overwrite) these tests from another branch where they are already fixed.

I know I can do

    git pull origin that_other_branch

but this will attempt to merge lots of other files, for that I am not yet ready.

Is it possible to pull and merge only the specified file (and not everything) from that another branch?

This is not a duplicate of *[Git pull request for just one file][1]* as all answers to that question are how to revert the locally changed file to the repository version, without changing any branches.

  [1]: https://stackoverflow.com/questions/8421552/git-pull-request-for-just-one-file



Is it possible to pull just one file in Git?

Is there such a thing as `git pull --dry-run` to see how stuff will be merged before it messes up my working tree?

Right now I am doing:

    git fetch origin &amp;&amp; git merge --no-commit --no-ff

I did not see anything in the man page for &#39;git-pull&#39; related to it.

To clarify, I just need it in an Ant script for deployment to see if there are conflicts when doing `git pull`, then back off exit out of build, fail deployment and leave that directory tree the same it was before `git pull`.


Is there a &quot;git pull --dry-run&quot; option in Git?

I find myself managing very many files (over 60 but below 70) and my commit messages so far follow this pattern:
when I have added something like on `layout.css`, my commit message is _&quot;added something on layout.css file&quot;_, and when I remove something, my commit message is _&quot;removed something from layout.css file&quot;_.

Some files down the line, I look at my commits feed and _added..._ and  _removed..._ messages dominate. Sometimes I don&#39;t remember what I removed or what I added in `layout.css` since I make so many changes at a go and so I struggle to come up with an appropriate commit message.

Is there a standard I should follow to help me come up with my commit messages?

Standard to follow when writing git commit messages

As Git user I regular come across the situation, that I need to rework one or more commits in a way which do not fit into `--amend` or `rebase -i`with fixup commits. Typically I would do something like

    git reset HEAD~1
    # hack, fix, hack
    git commit -a
    # argh .. do I need to retype my message?
 
I take sensible composed commit messages quite serious. They typically contain larger text with references &amp; justifications for the change. Until now, I&#39;m quite annoyed on the lengthy process to recover my old commit message via an unsorted `git reflog`, `git log`and copy &amp; paste process.

Is there a better to tackle this? And how would it, if my comprises more than one commit?

_Edit:_ After a bit thinking about this I think what I&#39;m looking for is some _git stash_-like functionality for commit messages where fixup/amend commits are not appropriate.

Git: How to reuse/retain commit messages after &#39;git reset&#39;?

What is the use of `chore` in [semantic version control commit messages](http://seesparkbox.com/foundry/semantic_commit_messages)? Other types like **feat** or **fix** are clear, but I don&#39;t know when to use &quot;chore&quot;.

Can anyone provide a couple of examples of its use?

Another maybe not related question: What&#39;s the proper type of messages of commits for modifying files like `.gitignore`?



Content Type	Original Author	Original Content on Stackoverflow
Question	Daan	View Question on Stackoverflow
Solution 1 - Git	Luigi R. Viggiano	View Answer on Stackoverflow
Solution 2 - Git	KingCrunch	View Answer on Stackoverflow

git pull - can't submit merge message

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Conditional logic in AngularJS template

Get name and line of calling function in node.js

Attributions