Assuming you&#39;re fine with taking all of the changes in master, what you want is:

    git checkout &lt;my branch&gt;

to switch the working tree to your branch; then:

    git merge master

to merge all the changes in master with yours.

If your branch is local only and hasn&#39;t been pushed to the server, use 

    git rebase master

Otherwise, use 

    git merge master

You can use the cherry-pick to get the particular bug fix commit(s)

    $ git checkout branch
    $ git cherry-pick bugfix

If you just want the bug fix to be integrated into the branch, `git cherry-pick` the relevant commit(s).

What is the SQL Server SYSNAME data type for? [BOL][1] says:

&gt; The sysname data type is used for
&gt; table columns, variables, and stored
&gt; procedure parameters that store object
&gt; names.

but I don&#39;t really get that. Is there a use-case you can provide?


  [1]: http://msdn.microsoft.com/en-us/library/ms191240%28v=SQL.100%29.aspx

What is SYSNAME data type in SQL Server?

I&#39;m getting image data (as `byte[]`) from DB. How to return this image in `@ResponseBody` ?

**EDIT**

I did it without `@ResponseBody` using `HttpServletResponse` as method parameter:

	@RequestMapping(&quot;/photo1&quot;)
	public void photo(HttpServletResponse response) throws IOException {
		response.setContentType(&quot;image/jpeg&quot;);
		InputStream in = servletContext.getResourceAsStream(&quot;/images/no_image.jpg&quot;);
		IOUtils.copy(in, response.getOutputStream());
	}
	

Using `@ResponseBody` with registered `org.springframework.http.converter.ByteArrayHttpMessageConverter` converter as @Sid said doesn&#39;t work for me :(.

	@ResponseBody
	@RequestMapping(&quot;/photo2&quot;)
	public byte[] testphoto() throws IOException {
		InputStream in = servletContext.getResourceAsStream(&quot;/images/no_image.jpg&quot;);
		return IOUtils.toByteArray(in);
	}



Spring MVC: How to return image in @ResponseBody?

I have a bug fix in my master, and I also want my branch to get that bug fix.  What `git` command do I use?

How can I keep my branch up to date with master with git?

<p>I have a bug fix in my master, and I also want my branch to get that bug fix.  What <code>git</code> command do I use?</p>


Is there a cleaner way to get the short version hash of `HEAD` from Git?

I want to see the same output as I get from:

     git log -n 1 | head -n 1 | sed -e &#39;s/^commit //&#39; | head -c 8

----

I originally used the above command to generate a version string, but this is even better:

    git describe --tags

It will output strings like `0.1.12` (tagged commit) or `0.1.11-5-g0c85fbc` (five commits after the tag).


Get the short Git version hash

I&#39;m having trouble getting post-recieve and post-commit hooks to work correctly with msysgit (Windows 7 Pro/32 and Ultimate/64). For post-commit hook I get the above error if I commit from either git-bash or the console, but it works fine if I commit through git-gui. For a post-recieve hook, all three give the same error. 

I&#39;m thinking this is some sort of permission or path error, but don&#39;t really have any clue where to start here.



msysgit error with hooks: &quot;git error: cannot spawn .git/hooks/post-commit: No such file or directory&quot;

I&#39;m apparently terrible at using git, despite my best attempts to understand it. 

From [kernel.org][1] for `git push`:
&gt; -u
&gt;
&gt; --set-upstream
&gt;
&gt; For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less git-pull(1) and other commands. For more information, see `branch.&lt;name&gt;.merge` in git-config(1).

Here&#39;s `branch.&lt;name&gt;.merge` from `git config`:
&gt; `branch.&lt;name&gt;.merge`
&gt;
&gt; Defines, together with `branch.&lt;name&gt;.remote`, the upstream branch for the given branch. It tells git fetch/git pull which branch to merge and can also affect git push (see push.default). When in branch `&lt;name&gt;`, it tells git fetch the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by `&quot;branch.&lt;name&gt;.remote&quot;`. The merge information is used by git pull (which at first calls git fetch) to lookup the default branch for merging. Without this option, git pull defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup git pull so that it merges into `&lt;name&gt;` from another branch in the local repository, you can point `branch.&lt;name&gt;.merge` to the desired branch, and use the special setting . (a period) for `branch.&lt;name&gt;.remote`.

I successfully set up a remote repository with github, and I successfully pushed my first commit to it with:

    git push -u origin master

Then, I unwittingly successfully pushed my second commit to my remote repository using:

    git commit -m &#39;[...]&#39;

However, incorrectly thinking I would have to push again to `origin` from `master`, I ran:
    
    # note: no -u
    git push origin master

What did that do? It didn&#39;t seem to have any effect at all. Did I &quot;undo&quot; `git push -u origin master`?

  [1]: http://www.kernel.org/pub/software/scm/git/docs/git-push.html

What exactly does the &quot;u&quot; do? &quot;git push -u origin master&quot; vs &quot;git push origin master&quot;

Does the .gitignore file belong in the .git folder structure somewhere or in the main source files?

Where does the .gitignore file belong?

When I open the **Git GUI**, I get a popup message that refers to `loose objects`. I did `git gc` and that removed the message.

What are `loose objects` and how could I prevent this from occurring again?

What are the &quot;loose objects&quot; that the Git GUI refers to?

If I want to merge into a Git branch the changes made only to some of the files changed in a particular commit which includes changes to multiple files, how can this be achieved?

Suppose the Git commit called `stuff` has changes to files `A`, `B`, `C`, and `D` but I want to merge only `stuff`&#39;s changes to files `A` and `B`. It sounds like a job for `git cherry-pick` but `cherry-pick` only knows how to merge entire commits, not a subset of the files.

How to git-cherry-pick only changes to certain files?

I&#39;ve never used Git before and would like to learn.

I have a private repository with GitHub.

I&#39;ve installed the EGit plugin for Eclipse.

I have a workspace where I do my work, generally: `~/Documents/workspace`.

I am able to add my GitHub repository and download it, but in doing so it creates `~/MyRepository`.

When I create a project, do I need to point it to `~/MyRepository`?

Also, how come when I make an edit and I say push to upstream it says up to date?

How do I set up Eclipse/EGit with GitHub?

I am trying to download a tarball from GitHub using [cURL][1], but it does not seem to be redirecting:

    $ curl --insecure https://github.com/pinard/Pymacs/tarball/v0.24-beta2
    &lt;html&gt;&lt;body&gt;You are being &lt;a href=&quot;https://nodeload.github.com/pinard/Pymacs/tarball/v0.24-beta2&quot;&gt;redirected&lt;/a&gt;.&lt;/body&gt;&lt;/html&gt;

Note: wget works for me:

    $ wget --no-check-certificate https://github.com/pinard/Pymacs/tarball/v0.24-beta2

However I want to use cURL because ultimately I want to untar it inline with something like:

    $ curl --insecure https://github.com/pinard/Pymacs/tarball/v0.24-beta2 | tar zx

I found that the URL after redirecting turned out to be https://download.github.com/pinard-Pymacs-v0.24-beta1-0-gcebc80b.tar.gz, but I would like cURL to be smart enough to figure this out.

  [1]: http://en.wikipedia.org/wiki/CURL


How do I download a tarball from GitHub using cURL?

I forked a project, made some changes, and got a pull request accepted. But now, the project I forked moved to another repository and is a fork of that repository.

That is:

    Original -&gt; MyFork

Now:

    NewOriginal -&gt; Original -&gt; MyFork

How would I get it to the following?

    NewOriginal -&gt; MyFork


How do I change which GitHub project I forked from?

I wanted to rename one of my repositories on GitHub, but I got scared when a big red warning said:

&gt; 1. We will not set up any redirects from the old location
2. You will need to update your local repositories to point to the new location
3. Renaming may take a few minutes to complete

Does anyone have step-by-step instructions on how to accomplish #1 and #2 manually? Or what do I have to do locally?

Content Type	Original Author	Original Content on Stackoverflow
Question	Nic Hubbard	View Question on Stackoverflow
Solution 1 - Git	John Doty	View Answer on Stackoverflow
Solution 2 - Git	Chetan	View Answer on Stackoverflow
Solution 3 - Git	manojlds	View Answer on Stackoverflow
Solution 4 - Git	Alan Haggai Alavi	View Answer on Stackoverflow

How can I keep my branch up to date with master with git?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Spring MVC: How to return image in @ResponseBody?

What is SYSNAME data type in SQL Server?

Attributions