### Solution

    git checkout master
    git merge C

*With `C` being the SHA1 of commit `C`.*

### Result

                     D (dev)
                    /
    master A - B - C (move master HEAD)


It should be a fast-forward merge.



Necromancy, I know.

    git branch -f master C

Will not touch current working tree at all - you can have your work in progress.

I&#39;d like to save some simple data. On the iPhone, I can do it with [`NSUserDefaults`][1] in Objective-C.

What is the similar command here in Android?

I&#39;m just saving a few variables, to be reused as long as the application is installed. I don&#39;t want to use a complicated database just to do that.

[1]: https://developer.apple.com/reference/foundation/nsuserdefaults?language=objc

Android equivalent of NSUserDefaults in iOS

For a given file in a Mercurial repository, how can you see the revision history?

And how can you diff two revisions of the file?  

Ideally doing all this with visual tools (we use ExamDiff to do some other diffs).

I&#39;d say this is basic source control functionality but I can&#39;t seem to figure out how to do this with Mercurial.

How to view revision history for Mercurial file?

*(This question is the opposite of [this one][1])*

How can I go from this

    dev            C - D
                 /
    master A - B 

to this?

    dev                D
                     /
    master A - B - C 

I know I&#39;m going to kick myself when I see the answer, but for the moment I&#39;m a bit stuck...

  [1]: https://stackoverflow.com/questions/1628563/git-move-recent-commit-to-a-new-branch

Point branch to new commit

(This question is the opposite of <a href="https://stackoverflow.com/questions/1628563/git-move-recent-commit-to-a-new-branch" target="_blank" rel="noopener noreferrer">this one</a>)
How can I go from this
<pre><code class="hljs language-css">dev C - D
 /
master A - B 
</code></pre>
to this?
<pre><code class="hljs language-css">dev D
 /
master A - B - C 
</code></pre>
I know I'm going to kick myself when I see the answer, but for the moment I'm a bit stuck...

How can I update  multiple git repositories from their shared parent&#39;s directory without `cd`&#39;ing into each repo&#39;s root directory? I have the following which are all separate git repositories (**not** submodules):

    /plugins/cms
    /plugins/admin
    /plugins/chart

I want to update them all at once or at least simplify my current workflow:

    cd ~/plugins/admin
    git pull origin master
    cd ../chart
    git pull

etc.

Run git pull over all subdirectories

Is there a way to add all files no matter what you do to them whether it be deleted, untracked, etc? like for a commit. I just don&#39;t want to have to `git add` or `git rm` all my files every time I commit, especially when I&#39;m working on a large product.

Git add all files modified, deleted, and untracked?

I have my text editor to automatically trim trailing whitespace upon saving a file, and I am contributing to an open source project that has severe problems with trailing whitespace.

Every time I try to submit a patch I must first ignore all whitespace-only changes by hand, to choose only the relevant information. Not only that, but when I run `git rebase` I usually run into several problems because of them.

As such I would like to be able to add to index only non-whitespace changes, in a way similar that `git add -p` does, but without having to pick all the changes myself.

Does anyone know how to do this?

EDIT: I **cannot** change the way the project works, and they have decided, after discussing it on the mailing list, to ignore this.


Add only non-whitespace changes

Are these the same thing? If so, why are there so many terms?!

Also, I know there is this thing called git stash, which is a place where you can temporarily store changes to your working copy without committing them to the repo. I find this tool really useful, but again, the name is very similar to a bunch of other concepts in git -&gt; this is very confusing!!

What&#39;s the difference between the index, cached, and staged in git?

I&#39;ve been using Git for a while now, and I recently started using it to tag my releases so that I could more easily keep track of changes and be able to see which version each of our clients is running (unfortunately the code currently mandates that each client have their own copy of the PHP site; I&#39;m changing this, but it&#39;s slow-going).

In any case, we&#39;re starting to build some momentum, and I thought it would be really good to be able to show people what has changed since the last release. The problem is, I haven&#39;t been maintaining a changelog, because I don&#39;t have a good idea of how to go about it. For this particular time, I can run through the log and manually create one, but that will get tiring very quickly.

I tried googling &quot;git changelog&quot; and &quot;git manage changelog&quot;, but I didn&#39;t find anything that really talked about the workflow of code changes and how that coincides with the changelog. We&#39;re currently following [Rein Henrichs&#39; development workflow][1] and I would love something that went along with that.

Is there a standard approach that I am missing, or is this an area where everybody does their own thing?

  [1]: http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html




Content Type	Original Author	Original Content on Stackoverflow
Question	Benjol	View Question on Stackoverflow
Solution 1 - Git	VonC	View Answer on Stackoverflow
Solution 2 - Git	aragaer	View Answer on Stackoverflow

Point branch to new commit

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution

Result

Solution 2 - Git

How to view revision history for Mercurial file?

Android equivalent of NSUserDefaults in iOS

Attributions