The asterisks show where something was committed:

`e1193f8`, `5a09431` and `30e367c` were committed to the left branch (yielding a `|` on the right branch) whereas `420eac9` was committed to the right branch (yielding a `|` on the left branch). And **that** is how `420eac9` differs from the rest: it&#39;s the only commit to the right branch.

For the sake of completeness:

- `d6016bc` was the branching point
- `5e3ee11` is the merging commit
- `2d3acf9` is the first commit after merging

`420eac9` is on a different branch than the 3 commits &quot;below&quot; it. The branches diverged after `d6016bc` and they were merged in `5e3ee11`.

I want to keep all of my JavaScript code in one section; just before the closing `body` tag in my master layout page and just wondering the best to go about it, MVC style.

For example, if I create a `DisplayTemplate\DateTime.cshtml` file which uses jQuery UI&#39;s DateTime Picker than I would embed the JavaScript directly into that template but then it will render mid-page.

In my normal views I can just use `@section JavaScript { //js here }` and then `@RenderSection(&quot;JavaScript&quot;, false)` in my master layout but this doesn&#39;t seem to work in display/editor templates - any ideas?

Using sections in Editor/Display templates

Open Source project [Trac][1] has an excellent diff highlighter &amp;mdash; it highlights changed lines **and changed bytes in each changed line!** See [here][2] or [here][3] for examples.

Is there way to use the same color highlight (i.e. changed lines **and changed bytes too**) in bash terminal, `git`, or `vim` **for diff output (patch-file)?**


  [1]: http://trac.edgewall.org/
  [2]: https://trac.transmissionbt.com/changeset/12148
  [3]: http://trac.gajim.org/changeset/297ad7711d20bfee1491768640d9bc5384464363

Highlight changed lines and changed bytes in each changed line

In the git community book, it says

&gt; Another interesting thing you can do is visualize the commit graph with the &#39;--graph&#39; option, like so:
&gt;
    $ git log --pretty=format:&#39;%h : %s&#39; --graph
    * 2d3acf9 : ignore errors from SIGCHLD on trap
    *   5e3ee11 : Merge branch &#39;master&#39; of git://github.com/dustin/grit
    |\
    | * 420eac9 : Added a method for getting the current branch.
    * | 30e367c : timeout code and tests
    * | 5a09431 : add timeout protection to grit
    * | e1193f8 : support for heads with slashes in them
    |/
    * d6016bc : require time for xmlschema

&gt; It will give a pretty nice ASCII representation of the commit history lines.

How should I read this graph? How does `420eac9` differ from the rest?

How to read git log graph

In the git community book, it says
> Another interesting thing you can do is visualize the commit graph with the '--graph' option, like so:
>
$ git log --pretty=format:'%h : %s' --graph
* 2d3acf9 : ignore errors from SIGCHLD on trap
* 5e3ee11 : Merge branch 'master' of git://github.com/dustin/grit
| 
| * 420eac9 : Added a method for getting the current branch.
* | 30e367c : timeout code and tests
* | 5a09431 : add timeout protection to grit
* | e1193f8 : support for heads with slashes in them
|/
* d6016bc : require time for xmlschema
> It will give a pretty nice ASCII representation of the commit history lines.
How should I read this graph? How does <code>420eac9</code> differ from the rest?

I am trying to figure out how to use git in my project workflow, and I have an existing Xcode project that I want to put into the repository. I think I have the repository set up correctly under organizer, but the Source Control menu is grayed out.  
Apparently, it&#39;s easy to do if you start a new project, but how do I import an existing project with snapshots and everything?

I&#39;m using Xcode 4 and git 1.7.4

Also, if there are any good walkthroughs on git configuration and best practices, that would be nice. I&#39;m a little late to the game, so anything that can get me up to speed would be cool.

Using Git with an existing Xcode project

How can a pull request on github be cancelled?  

How to cancel a pull request on github?

I tried to put a series of GIT commands that I always use continuously togeter as batch files so that I don&#39;t repeat myself too much. For example, I have this batch file called `update_repo_branch.bat` to update a local repo and synch a branch with the remote branch:  

&gt; @echo off  
if(%1) == () goto end  
if(%2) == () goto end  
cd %1  
git checkout %2  
git fetch origin  
git merge oring/%2  
:end

Good to be lazy, but what I found is that **when a GIT command is finished, it seems to send an exit flag back to terminate whatever is running**. Therefore, using a batch file to exectute them all in one go simply doesn&#39;t work. Any idea how to work around it?

How do I execute several git commands in a batch file without terminating after the first command?

Git beginner question:

I have a small private webproject which is versioned locally with msysgit. There is no exterior repository, as it&#39;s only for me, so i can bascially do whatever I want.

I&#39;ve had this set up in the project directory, ie in &quot;webroot&quot;.

Now a second directory had to be created, placed parallel to webroot. Let&#39;s call it assets.

So structure is now as follows:

    \ project directory
    ----\webroot
    ----\assets

I&#39;d love to include this new directory in the git repository, so that I&#39;d also version changes to files stored there, but of course I can&#39;t use &quot;git add ../assets&quot;. Neither am I inclined to create a new git project in project_directory, as this would loose all my previous commits.

So how do I go about moving the repository out of &quot;webroot&quot; up into &quot;project_directory&quot;, while keeping my commits and then being able to include &quot;assets&quot;?

Moving a git repository up one hierarchy level

I&#39;ve been trying to find a way to update JIRA when I commit to github.

It doesn&#39;t look like there are any service hooks to do it at github, but you never know, someone might have a ninja way, so I thought I&#39;d ask.

How do I connect github to JIRA?

I have a branch called develop in my local repo, and I want to make sure that when I push it to origin it&#39;s merged with the origin/master. Currently, when I push it&#39;s added to a remote develop branch. 

How can I do this?

How do I push a local Git branch to master branch in the remote?

To move the branch pointer of a checked out branch, one can use the `git reset --hard` command. But how to move the branch pointer of a not-checked out branch to point at a different commit (keeping all other stuff like tracked remote branch)?

Move branch pointer to different commit without checkout

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

I&#39;ve got a project hosted on GitHub which somebody has forked. On their fork, they&#39;ve created a new branch &quot;foo&quot; and made some changes.  How do I pull their &quot;foo&quot; into a new branch also named &quot;foo&quot; in my repo?

I understand they could submit a pull request to me, but I&#39;d like to initiate this process myself.

Assume the following:

 1. Because they forked my project, both our repos share the same &#39;history&#39;
 2. Although GitHub shows their project was forked from mine, my local repository doesn&#39;t have any references to this person&#39;s project. Do I need to add theirs as a remote?
 3. I don&#39;t have a branch called &quot;foo&quot; yet - I don&#39;t know if I need to manually create this first.
 4. I definitely want this pulled into a separate branch and not my master.


How to pull remote branch from somebody else&#39;s repo

When you run `git log --decorate --pretty=oneline` the output will have entries like `(HEAD, refs/published/master, master)` with coloration.

I also have the following in my gitconfig:

    [color &quot;branch&quot;]
        current = yellow reverse
        local = yellow
        remote = green


How do you replicate those colors when doing a custom format like the following?

    git log --decorate --stat --graph --pretty=format:&quot;%d %Cgreen%h%Creset (%ar - %Cred%an%Creset), %s%n&quot;

Color in git-log

If `my-feature-branch` was merged into `my-main-branch`, how can I see what commits were merged in from `my-feature-branch`?

How to see commits that were merged in to a merge commit?

I checked some source code into GIT with the commit message &quot;Build 0051&quot;.

However, I can&#39;t seem to find that source code any more - how do I extract this source from the GIT repository, using the command line?

**Update**

1. Checked in versions 0043, 0044, 0045 and 0046 using SmartGIT.
2. Checked out 0043, and checked in versions up to 0051 on a different branch.
3. Checked out 0043 again.
4. Now, 0051 has disappeared.

**Update**

The source code is definitely there, now its a matter of checking it out:

    C:\Source&gt;git log -g --grep=&quot;0052&quot;
    commit 77b1f718d19e5cf46e2fab8405a9a0859c9c2889
    Reflog: HEAD@{10} (unknown &lt;Mike@.(none)&gt;)
    Reflog message: commit: 20110819 - 1724 - GL: Intermediate version. File version:  v0.5.0 build 0052.
    Author: unknown &lt;Mike@.(none)&gt;
    Date:   Fri Aug 19 17:24:51 2011 +0100

        20110819 - 1724 - GL: Intermediate version. File version: v0.5.0 build 0052.

    C:\Source&gt;

How to search a Git repository by commit message?

How can I have a list with all the files that were changed in the last 2 days? I know about 
    
    git log --name-status --since=&quot;2 days ago&quot; 

but this will show me ids, dates and commit messages. All I need is the list of the file names which were changed.

Is that possible with git?

Git show files that were changed in the last 2 days

Given a period of time (e.g. a day, a week, a month), is it possible to list all files that were modified or added in this time?

Content Type	Original Author	Original Content on Stackoverflow
Question	michael	View Question on Stackoverflow
Solution 1 - Git	eckes	View Answer on Stackoverflow
Solution 2 - Git	Ilkka	View Answer on Stackoverflow

How to read git log graph

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Highlight changed lines and changed bytes in each changed line

Using sections in Editor/Display templates

Attributions