Instead of doing `--all` and then trying to filter out the stashes, don&#39;t ever include them in the first place:

    git log --branches --remotes --tags --graph --oneline --decorate

The main problem that arises from trying to filter them out afterwards is that if the stash is the latest commit on that branch (because even though it&#39;s not the `head` of the branch, it&#39;s still the most recent descendant of it), it can actually filter out the entire branch from the log, which isn&#39;t what you want.

My alias:

    [alias]
        l = log --oneline --decorate --graph --exclude=refs/stash
In this case you will be able to use these forms without showing the stash:

- `git l` for the current branch
- `git l feature234` for a specific branch
- `git l --all` for the overall history

From the manual:

&gt; --exclude=&amp;lt;glob pattern&amp;gt;
&gt;
&gt;Do not include refs matching &lt;glob-pattern&gt; that the next --all, --branches, --tags, --remotes, or --glob would otherwise consider.

Note that [Andrew&#39;s answer][1] wouldn&#39;t work for hiding [StGit][]&lt;sup&gt;1.)&lt;/sup&gt; branches `&lt;branch&gt;.stgit` (from StGit version 0.15) which otherwise litter the output making it unusable.

Currently I use the following solution:

    $ git log --graph --oneline --decorate \
      $(git for-each-ref --format=&quot;%(refname)&quot; refs/heads/ refs/remotes/ |
        grep -v &quot;\.stgit$&quot;)


----

_&lt;sup&gt;1.)&lt;/sup&gt; StGit (&quot;&lt;b&gt;St&lt;/b&gt;acked &lt;b&gt;Git&lt;/b&gt;&quot;) provides Quilt/mq--like functionality to Git (i.e. pushing/popping patches to/from a stack)._

[1]: https://stackoverflow.com/a/9438578/46058
[StGit]: http://www.procode.org/stgit/

Recently I was trying for a company ‘x’. They sent me some set of questions and told me to solve only one.
 
The problem is like this -
 
Basic sales tax is applicable at a rate of 10% on all goods, except books, food, and medical products that are exempt.  
Import duty is an additional sales tax applicable on all imported goods at a rate of 5%, with no exemptions. 

When I purchase items I receive a receipt which lists the name of all the items and their price (including tax), finishing with the total cost of the items, and the total amounts of sales taxes paid.  
The rounding rules for sales tax are that for a tax rate of n%, a shelf price of p contains (np/100 rounded up to the nearest 0.05) amount of sales tax.

“They told me, they are interested in the **Design Aspect** of your solution and would like to evaluate my **Object Oriented Programming Skills**.”

This is what they told in their own words

 - For the solution, we would want you use either Java, Ruby or C#.
 - We are interested in the DESIGN ASPECT of your solution and would like to evaluate your **Object Oriented Programming Skills**.
 - You may use external libraries or tools for building or testing purposes. Specifically, you may use unit testing libraries or build tools available for your chosen language (e.g., JUnit, Ant, NUnit, NAnt, Test::Unit, Rake etc.)
 - Optionally, you may also include a brief explanation of your design and assumptions along with your code.
 - Kindly note that we are NOT expecting a web-based application or a comprehensive UI. Rather, we are expecting a simple, console based application and interested in your source code.
 
So I provided below code – you can just copy paste code and run in VS.
 
    class Program
     {
         static void Main(string[] args)
         {
             try
             {
                 double totalBill = 0, salesTax = 0;
                 List&lt;Product&gt; productList = getProductList();
                 foreach (Product prod in productList)
                 {
                     double tax = prod.ComputeSalesTax();
                     salesTax += tax;
                     totalBill += tax + (prod.Quantity * prod.ProductPrice);
                     Console.WriteLine(string.Format(&quot;Item = {0} : Quantity = {1} : Price = {2} : Tax = {3}&quot;, prod.ProductName, prod.Quantity, prod.ProductPrice + tax, tax));
                 }
                 Console.WriteLine(&quot;Total Tax : &quot; + salesTax);
                 Console.WriteLine(&quot;Total Bill : &quot; + totalBill);                
            }
             catch (Exception ex)
             {
                 Console.WriteLine(ex.Message);
             }
             Console.ReadLine();
         }
 
        private static List&lt;Product&gt; getProductList()
         {
             List&lt;Product&gt; lstProducts = new List&lt;Product&gt;();
             //input 1
             lstProducts.Add(new Product(&quot;Book&quot;, 12.49, 1, ProductType.ExemptedProduct, false));
             lstProducts.Add(new Product(&quot;Music CD&quot;, 14.99, 1, ProductType.TaxPaidProduct, false));
             lstProducts.Add(new Product(&quot;Chocolate Bar&quot;, .85, 1, ProductType.ExemptedProduct, false));
 
            //input 2
             //lstProducts.Add(new Product(&quot;Imported Chocolate&quot;, 10, 1, ProductType.ExemptedProduct,true));
             //lstProducts.Add(new Product(&quot;Imported Perfume&quot;, 47.50, 1, ProductType.TaxPaidProduct,true));
 
            //input 3
             //lstProducts.Add(new Product(&quot;Imported Perfume&quot;, 27.99, 1, ProductType.TaxPaidProduct,true));
             //lstProducts.Add(new Product(&quot;Perfume&quot;, 18.99, 1, ProductType.TaxPaidProduct,false));
             //lstProducts.Add(new Product(&quot;Headache Pills&quot;, 9.75, 1, ProductType.ExemptedProduct,false));
             //lstProducts.Add(new Product(&quot;Imported Chocolate&quot;, 11.25, 1, ProductType.ExemptedProduct,true));
             return lstProducts;
         }
     }
 
    public enum ProductType
     {
         ExemptedProduct=1,
         TaxPaidProduct=2,
         //ImportedProduct=3
     }
 
    class Product
     {
         private ProductType _typeOfProduct = ProductType.TaxPaidProduct;
         private string _productName = string.Empty;
         private double _productPrice;
         private int _quantity;
         private bool _isImportedProduct = false;
 
        public string ProductName { get { return _productName; } }
         public double ProductPrice { get { return _productPrice; } }
         public int Quantity { get { return _quantity; } }
 
        public Product(string productName, double productPrice,int quantity, ProductType type, bool isImportedProduct)
         {
             _productName = productName;
             _productPrice = productPrice;
             _quantity = quantity;
             _typeOfProduct = type;
             _isImportedProduct = isImportedProduct;
         }
 
        public double ComputeSalesTax()
         {
             double tax = 0;
             if(_isImportedProduct) //charge 5% tax directly
                 tax+=_productPrice*.05;
             switch (_typeOfProduct)
             {
                 case ProductType.ExemptedProduct: break;
                 case ProductType.TaxPaidProduct:
                     tax += _productPrice * .10;
                     break;
             }
             return Math.Round(tax, 2);
             //round result before returning
         }
     }
 
you can uncommnet input and run for different inputs.
 
I provided the solution but I was rejected.
 
&quot;They said, they are unable to consider me for our current open positions because code solution is not satisfactory.&quot;
 
Please guide me what is missing here. Is this solution is not a good OOAD solution.  
How can I improve my OOAD skills.  
My seniors also says perfect OOAD application will also not work practically.
 
Thanks

How to create the perfect OOP application

I was wondering how to suppress the warning:

&gt; Category is implementing a method which will also be implemented by
&gt; its primary class.

I have this for a specific code category:


    + (UIFont *)systemFontOfSize:(CGFloat)fontSize {
	    return [self aCustomFontOfSize:fontSize];
    }


Suppress warning &quot;Category is implementing a method which will also be implemented by its primary class&quot;

I have a Git alias that expands to:

    git log --graph --oneline --all --decorate

According to `man git log` there are a couple of suspicious options: `--not` and `--branches`; but I can&#39;t make it work properly.

How should I edit that to hide the stashes?

---

**FYI**: as per the [accepted question][1] and [comment][2] my `.gitconfig` alias now looks like this:

    [alias]
        l = log --branches --remotes --tags --graph --oneline --decorate --notes HEAD


[1]: https://stackoverflow.com/a/9438578/477168
[2]: https://stackoverflow.com/questions/9437182/git-show-all-branches-but-not-stashes-in-log#comment46034208_9438578

Git show all branches (but not stashes) in log

I have a Git alias that expands to:
<pre><code class="hljs language-css">git log --graph --oneline --all --decorate
</code></pre>
According to <code>man git log</code> there are a couple of suspicious options: <code>--not</code> and <code>--branches</code>; but I can't make it work properly.
How should I edit that to hide the stashes?
<hr>
FYI: as per the <a href="https://stackoverflow.com/a/9438578/477168" target="_blank" rel="noopener noreferrer">accepted question</a> and <a href="https://stackoverflow.com/questions/9437182/git-show-all-branches-but-not-stashes-in-log#comment46034208_9438578" target="_blank" rel="noopener noreferrer">comment</a> my <code>.gitconfig</code> alias now looks like this:
<pre><code class="hljs language-css">[alias]
 l = log --branches --remotes --tags --graph --oneline --decorate --notes HEAD
</code></pre>

I&#39;ve been doing iOS development for a couple of months now and just learned of the promising [CocoaPods][1] library for dependency management.

I tried it out on a personal project: added a dependency to [Kiwi][2] to my Podfile, ran `pod install CocoaPodsTest.xcodeproj`, and *voila*, it worked great.

The only thing I&#39;m left wondering is: what do I check in, and what do I ignore for version control? It seems obvious that I want to check in the Podfile itself, and probably the .xcworkspace file as well; but do I ignore the Pods/ directory? Are there other files that will be generated down the road (when I add other dependencies) that I should also add to my .gitignore?

  [1]: http://cocoapods.org/
  [2]: https://github.com/allending/Kiwi

What goes into your .gitignore if you&#39;re using CocoaPods?

I wanted to find the 10 largest files in my repository. The script I came up with is as follows:

    REP_HOME_DIR=&lt;top level git directory&gt;
    max_huge_files=10

    cd ${REP_HOME_DIR}
    git verify-pack -v ${REP_HOME_DIR}/.git/objects/pack/pack-*.idx | \
      grep blob | \
      sort -r -k 3 -n | \
      head -${max_huge_files} | \
      awk &#39;{ system(&quot;printf \&quot;%-80s \&quot; `git rev-list --objects --all | grep &quot; $1 &quot; | cut -d\&quot; \&quot; -f2`&quot;); printf &quot;Size:%5d MB Size in pack file:%5d MB\n&quot;, $3/1048576,  $4/1048576; }&#39;
    cd -

Is there a better/more elegant way to do the same?

By &quot;files&quot; I mean the files that have been checked into the repository. 

How to find the N largest files in a git repository?

How would you get a count of all the files currently in a git repository?


How to get a count of all the files in a git repository?

I made something very stupid.
I made a commit using git commit (file edits + new files) (C).
Then I made amend last commit.
Then I deleted all files recursively (!) using `git rm -r`
Then I made another git commit (C).

&lt;pre&gt;
A-B-C
    ↑
  master
&lt;/pre&gt;

Is there any way to undelete the files but keep the changes I had in my first commit? (C)
I&#39;d rather do not go back to (B).
I tried git reset --soft head^, so then the git status lists files I deleted, then I did git checkout, but still no luck. I don&#39;t even know if it&#39;s possible.


Undo delete in GIT

Git uses a delta compression to store objects that are similar to each-other. 

Is this algorithm standardized and used in other tools as well? Is there documentation describing the format? Is it compatible with xdelta/VCDIFF/RFC 3284? 

Is the git binary diff algorithm (delta storage) standardized?

I&#39;m trying to learn Git with the help of [Git Immersion][1].   
There&#39;s one thing that frustrates me whenever I use `git log` or `git diff`:

![Git log shows (END) marker][2]

I can&#39;t figure out what to do next when I encounter this `(END)` word.

I can&#39;t type any commands, and I end up closing the current Bash window and open another. How do I type in the next command that I want to use?

  [1]: http://gitimmersion.com/
  [2]: http://i.stack.imgur.com/yJ0Ms.png


How to exit git log or git diff

Is there a way to see with `git log` or some other command only the commits that were added after branch creation?

    usage: git log [&lt;options&gt;] [&lt;since&gt;..&lt;until&gt;] [[--] &lt;path&gt;...]
       or: git show [options] &lt;object&gt;...
    
        --quiet               suppress diff output
        --source              show source
        --decorate[=...]      decorate options

show commits since branch creation

Suppose your git commit history looks like this:

    A---B---C---D---E---F master
         \         /
          X---Y---Z topic

Is it possible to have git list only the commits on master, A-F? In other words, if the commit was on a merged-in branch, I don&#39;t want it show.

Git: How to list commits on this branch but not from merged branches

Say I have a file `foo.js` that was committed some time ago. I would like to
simply find the commit where this file was first added.

After reading the answers and my own tinkering, this works for me

&lt;!-- language: sh --&gt;

    git log --follow --diff-filter=A --find-renames=40% foo.js

git - Find commit where file was added

I have 2 branches A and B.

Whenever I run a build, Branch A gets merged into Branch B. I want to be able to email out all the updates made in A, since the last time the build was ran.  How can I use `git log` to be able to copy all the commits made in A since the last A -&gt; B merge?

git log the difference between 1 branch from another

I can&#39;t pop my stash because I merged a branch which apparently conflicts with my stash and now my stash is seemingly unable to be popped.

    app.coffee: needs merge
    unable to refresh index

Anyone know how to resolve this?

**FIXED!**

Turns out the actual issue was an unresolved merge conflict from the merge, **NOT** that the stash would cause a merge conflict.

Resolution: Commit the conflicted file.

Git stash pop- needs merge, unable to refresh index

Say my current branch is myfeature. I want to get master up to date. Both `git merge` `git pull` always merge into the current branch, as far as I can tell.

Is there a way to merge changes from a remote branch (eg, origin/master) into a branch I&#39;m not currently on (master)? I can think of one way:

    git stash
    git checkout master
    git pull origin/master
    git checkout myfeature
    git stash apply

Is there a better one?

(It&#39;s possibly my whole question is wrong: would `git fetch` automatically update master to match origin/master, if remote-tracking is enabled?)

How to pull into not-the-current-branch?

I cannot apply stash back to the working directory.

**Little story:**

First I tried to push some committed changes, but it said: &quot;no you can&#39;t, pull first&quot;... OK then, I&#39;ll pull things from GitHub and then push my changes. When I tried to pull, it said that I had changes that would be overwritten, and that I should stash my changes. OK, I stashed the changes... did the pull, and push the committed changes. But now, I cannot restore the uncommitted changes I was working on.

*This is the error:*

    MyPath/File.cs already exists, no checkout
    Could not restore untracked files from stash

For sure I don&#39;t yet understand all the concepts of git, they confuse me a bit... maybe I did something wrong.

It would be great if someone could help me solve this... I&#39;ve been searching google and everything for more than an hour now, and I didn&#39;t come to a solution yet.

Help is much appreciated. Thanks!

Why can&#39;t stash be applied to the working directory?

I see [here](http://git-scm.com/book/en/Git-Tools-Stashing) you can apply/unapply a stash and even create a new branch off of a stash. Is it possible to simply see what is inside the stash without actually applying it?

See what&#39;s in a stash without applying it

I was always under the impression that you could give a stash a name by doing `git stash save stashname`, which you could later on apply by doing `git stash apply stashname`. But it seems that in this case all that happens is that `stashname` will be used as the stash description.

Is there no way to actually name a stash? If not, what would you recommend to achieve equivalent functionality? Essentially I have a small stash which I would periodically like to apply, but don&#39;t want to always have to hunt in `git stash list` what its actual stash number is.

Content Type	Original Author	Original Content on Stackoverflow
Question	cYrus	View Question on Stackoverflow
Solution 1 - Git	Andrew Marshall	View Answer on Stackoverflow
Solution 2 - Git	five	View Answer on Stackoverflow
Solution 3 - Git	Jakub Narębski	View Answer on Stackoverflow

Git show all branches (but not stashes) in log

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Suppress warning "Category is implementing a method which will also be implemented by its primary class"

How to create the perfect OOP application

Attributions