It&#39;s basically 4 step process. But a bit risky if multiple team member are working on the same branch and have their own copies. (If you are the only one working on it, go for it)

This git manual explains it beautifully: [Amending older or multiple commit messages][1]

1. `git rebase -i HEAD~X`  (X=No of commit messages you want to change)
2. Above command will open git file in editor. There replace text &#39;pick&#39; with &#39;reword&#39; and save the file.
3. It will open editor for every commit one by one, there you again change the commit message.
4. At the end: `git push -f`


  [1]: https://help.github.com/articles/changing-a-commit-message/#amending-older-or-multiple-commit-messages

If it is the most recent commit, you can simply do this in 2 steps:

1. `git commit --amend -m &quot;modified commit message&quot;` (amend message)
2. `git push --progress origin --force` ( &lt;sup&gt;⚠️&lt;/sup&gt; force push!)

---

⚠️ Be careful using `--force` or `-f`! [Bad things might happen][1]...

&gt; Force pushing is strongly discouraged since this changes the history of your repository. If you force push, people who have already cloned your repository will have to manually fix their local history.

IMHO you can force push to a branch if you&#39;re absolutely sure that nobody else checked out the amended commit before your push.

And here you can find documentation on [git commit][2] and [git push][3].


  [1]: https://stackoverflow.com/q/13036947/1429387
  [2]: https://git-scm.com/docs/git-commit
  [3]: https://git-scm.com/docs/git-push

I don&#39;t know if you can change the commit message but you can make a comment under your commit message.I think this is somehow a change in your comment.
You click on your commit message&#39;s number and beneath your message you can make any comment you want.
Then a &quot;K1&quot; sign will appear next to your message which means that you have one comment in your message which will remind you that you changed your message...
I hope this will help you...

I have the following code:

	catch(Exception ex)
	{
		throw new FatalException(&quot;An error occurred while trying to load the XSLT file.&quot;, ex);
	}

This unfortunately just swallows up the Exception.  I can fix this by doing the following:

	catch(Exception ex)
	{
		throw;
	}

But I would still like to include the custom message for help with event logging.

How do I add this message to the exception without losing any information?  (stack trace/debug symbols, etc.)

How can I add a message to an exception without losing any information in C#?

In the `before_request()` function (below), I want to redirect the user to `/login` if they are not yet logged in. Is there a special variable that will give me the current URL that will work as the below example does?

    @app.before_request
    def before_request():
        # the variable current_url does not exist
        # but i want something that works like it
        if (not &#39;logged_in&#39; in session) and (current_url != &#39;/login&#39;):
            return redirect(url_for(&#39;login&#39;))

I need to check that the current URL is `/login`, because if I don&#39;t the server goes into an infinite loop.

flask before request - add exception for specific route

I need to change an old git commit message in Bitbucket. I tried `git rebase -i` and reworded my message, but when I pulled and committed it just kept the old message in Bitbucket and merged my changes in.

How do I change a git commit message in Bitbucket?

<p>I need to change an old git commit message in Bitbucket. I tried <code>git rebase -i</code> and reworded my message, but when I pulled and committed it just kept the old message in Bitbucket and merged my changes in.</p>


I have a local git repository which is a clone of a repository on github. Someone has forked the repository and made changes in a new branch on a new repository. I want to move this new branch into my repository (locally to work on it first before merging with the master).

I tried creating a new branch and then pulling from the forked repository but it complains because the new branch is a copy of the master branch as well as the local file changes, so it says 

`error: Your local changes to the following files would be overwritten by merge`.

So how can I pull the branch in the other repository into a new branch on my local repository?

I hope that makes sense. If not, this is my repository: https://github.com/MatthewLM/cbitcoin

As you can see, someone has created a new repository with the branch &quot;linuxBuild&quot;: https://github.com/austonst/cbitcoin/tree/linuxBuild

I want that branch on my local repository for MatthewLM/cbitcoin.

How can I do this?

Git pulling a branch from another repository?

How do I replace a git submodule with a different git repo?

Specifically, I have a submodule:

 - located at `./ExternalFrameworks/TestFramework` that points to a git repo `git@github.com:userA/TestFramework.git` 
 - I&#39;d like it to now point to `git@github.com:userB/TestFramework.git`.

The problem is that when I delete the submodule with the method described [here][1], then re-add it using the command     

    git submodule add git@github.com:userB/TestFramework.git

I get this error:

    A git directory for &#39;ExternalFrameworks/TestFramework&#39; is found locally with remote(s):
      origin	git@github.com:userA/TestFramework.git
    If you want to reuse this local git directory instead of cloning again from
      git@github.com:userB/TestFramework.git
    use the &#39;--force&#39; option. If the local git directory is not the correct repo
    or you are unsure what this means choose another name with the &#39;--name&#39; option.


  [1]: https://stackoverflow.com/questions/1260748/how-do-i-remove-a-git-submodule

How do I replace a git submodule with another repo?

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

I&#39;m trying to rebase &#39;dev&#39; to catch up to &#39;master&#39; branch. 

    $ git checkout dev 
    $ git rebase master 
    First, rewinding head to replay your work on top of it...
    Applying: Corrected compilation problems that came from conversion from SVN.
    Using index info to reconstruct a base tree...
    M       src/com/....
    &lt;stdin&gt;:125: trailing whitespace.
    /**
    &lt;stdin&gt;:126: trailing whitespace.
     *
    &lt;stdin&gt;:127: trailing whitespace.
     */
    &lt;stdin&gt;:128: trailing whitespace.
    package com....
    &lt;stdin&gt;:129: trailing whitespace.
    
    warning: squelched 117 whitespace errors
    warning: 122 lines add whitespace errors.
    Falling back to patching base and 3-way merge...
    Auto-merging src/com/....
    CONFLICT (content): Merge conflict in src/com/...
    Failed to merge in the changes.
    Patch failed at 0001 Corrected compilation problems that came from conversion from SVN.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.
    
    $ vi src/com/.....   { fixed the merge issue on one file } 
    $ git add -A . 
    $ git rebase --continue 
    src/com/....: needs merge
    You must edit all merge conflicts and then
    mark them as resolved using git add
    $ vi src/com....      { verified, no &gt;&gt;&gt; or &lt;&lt;&lt; left, no merge markers } 
    $ git rebase --continue 
    Applying: Corrected compilation problems that came from conversion from SVN.
    No changes - did you forget to use &#39;git add&#39;?
    If there is nothing left to stage, chances are that something else
    already introduced the same changes; you might want to skip this patch.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.

Any ideas?

Git rebase merge conflict cannot continue

# Background

Using Git 1.8.1.1 on Linux. The repository looks as follows:

    master
      book

The submodule was created as follows:

    $ cd /path/to/master
    $ git submodule add https://user@bitbucket.org/user/repo.git book

The `book` submodule is clean:

    $ cd /path/to/master/book/
    $ git status
    # On branch master
    nothing to commit, working directory clean

# Problem

The master, on the other hand, shows there are &quot;new commits&quot; for the book submodule:

    $ cd /path/to/master/
    $ git status
    # On branch master
    # Changes not staged for commit:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   book (new commits)
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

Git should ignore the submodule directory completely, so that the master is also clean:

    $ cd /path/to/master/
    $ git status
    # On branch master
    nothing to commit, working directory clean

# Failed Attempt #1 - dirty

Inside the file `master/.gitmodules` is the following, as per this [answer][1]:

    [submodule &quot;book&quot;]
            path = book
            url = https://user@bitbucket.org/user/repo.git
            ignore = dirty

# Failed Attempt #2 - untracked

Changed `master/.gitmodules` to the following, as per this [answer][2]:

    [submodule &quot;book&quot;]
            path = book
            url = https://user@bitbucket.org/user/repo.git
            ignore = untracked

# Failed Attempt #3 - showUntrackedFiles

Edited `master/.git/config` to the following, as per this [answer][3]:

    [status]
       showUntrackedFiles = no

# Failed Attempt #4 - ignore

Added the book directory to the master ignore file:

    $ cd /path/to/master/
    $ echo book &gt; .gitignore

# Failed Attempt #5 - clone

Added the book directory to the master as follows:

    $ cd /path/to/master/
    $ rm -rf book
    $ git clone https://user@bitbucket.org/user/repo.git book

# Question

How can the `book` submodule be in its own repository directory under the `master` repository yet have git ignore the `book` submodule? That is, the following should not display:

    #
    #       modified:   book (new commits)
    #

How to suppress that message when executing `git status` in the master repository?

An article about [git submodule pitfalls][4] suggests this an inappropriate submodule usage?


  [1]: https://stackoverflow.com/a/5542452/59087
  [2]: https://stackoverflow.com/a/5127213/59087
  [3]: https://stackoverflow.com/a/4345788/59087
  [4]: http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/


Ignore new commits for git submodule

I can&#39;t figure out or find the documentation on how to access the source of an old commit in the new Bit Bucket format. Is this even possible anymore?

How to access full source of old commit in BitBucket?

I made a mistake and I don&#39;t know how to delete my latest push in the repository. I pull the latest updates of the app but it has conflicts and I push it to repository. 

How to delete my last commit? Or how to fix it?

Delete last commit in bitbucket

I&#39;m a team leader in our web development company, and I&#39;d like to implement Git workflow in our team. Reading documentation and articles I&#39;ve found the following structure good for us:

We have a repository in a Bitbucket. **Master** branch is considered to contain stable code only. Every dev must create his own branch and implement features/bugfixes in his **own** branch. Once he decides, that his code is ready, he creates a nice branch history (using rebase, amend, cherry-pick etc.) and pushes it to Bitbucket, where creates a pull request to master branch. QA verifies functionality and approves (or disapproves) it, then I&#39;m verifying code and if it is ok, I merge his work into master (by fast-forward or rebasing for better commits history).

But this scheme is good only in a case, when single developer works on a branch. In our case we almost always have two developers for one branch, since one developer is working on *server-side* (PHP), and another - *client-side* (HTML/CSS/JS). How these two should collaborate in a way, that commit history in master stays clean?

Server dev creates basic structure of HTML files and client dev needs to get this structure. Logically would be for server dev to create a branch, and for client dev to create his own branch, based on server dev branch. But this means, that server dev needs to *publish* his branch in Bitbucket, which will make it *impossible for him to rebase or change commits*, that are already published.

Another option is to wait, until server dev finishes his work, publishes branch with nice commits history and forgets about it, and only after that client dev starts to work in this branch, but this will cause time delays, which is even worse.

How do you handle such a collaboration in your workflows?


Proper git workflow scheme with multiple developers working on same task

I&#39;ve created lots of branches in one of our repositories. Those branches are for testing before it will be pulled to the master. Now I see lots of them on the list and they we will never use it again. How to delete those branches directly to Bitbucket?

Delete branches in Bitbucket

I&#39;m in a team of three; two are working locally, and I am working on the server.  

My coworker set up the account, but gave me full privileges to the repository.

I set my username and email in git:

    git config --global user.name &quot;bozdoz&quot;
    git config --global user.email email@email.com

and they are identical to my username and email on bitbucket.org.

But when I pull or push to the repository it indicates their username in the prompt:

    Password for &#39;https://theirusername@bitbucket.org&#39;:

I was able to get a prompt for my password after trying to pull by indicating the URL with my username:

    git pull https://bozdoz@bitbucket.org/path/repo.git

and it said up-to-date; and then when I pushed, it said no-fast-forward.  

I read that I need to specify the branch, but I don&#39;t know how to do that in a push statement while I&#39;m also specifying the repo URL:

    git push https://bozdoz@bitbucket.org/path/repo.git

I am able to pull and push if my co-worker is around and can put his password in.  But this is also listing him as the author of the push, and not me.

How can I pull and push to a repo branch as my own username?

Content Type	Original Author	Original Content on Stackoverflow
Question	MonkeyBonkey	View Question on Stackoverflow
Solution 1 - Git	Jadav Bheda	View Answer on Stackoverflow
Solution 2 - Git	naXa stands with Ukraine	View Answer on Stackoverflow
Solution 3 - Git	Dchris	View Answer on Stackoverflow

How do I change a git commit message in Bitbucket?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

flask before request - add exception for specific route

How can I add a message to an exception without losing any information in C#?

Attributions