为什么我的提交历史记录看起来像这样，我该如何解决呢？

Question

So for the past few days, I have been trying to figure out why my git commit history looks something like this where my commit history is not linear like I would like it to be? I have tried many things to try to get this so called flattened out but to no avail.

If anybody out there could help that would be greatly appreciated.

View from git log --oneline --graph command in git bash

View from git log with in SmartGit

Here is the error that I got after I ran git rebase 0fa9983894820ac8062a7413188e4ea2bc28089b

Answer 1

Check out my ugly tree:

* 8d61057 (HEAD -> master) file4
*   61795ae Merge branch 'new'
|\  
| * 56f104d file2
* | 2484695 file3
|/  
* ecc3f4f init

Notice that 61795ae Merge branch 'new' introduces nothing new, but is merely a merge commit.

I can get my trunk back in a straight line with rebase from the last commit before the split.

git rebase ecc3f4f

Now the tree is all straight again

* e794681 (HEAD -> master) file4
* b65595a file3
* 3d6ffe9 file2
* ecc3f4f init

---

Explanation

After cloning your project, I wanted to take a look at the commits to see the conflict.

You renamed this backup script.

051dae3 Rename backup final ftp.py to backup ftp v.4 (final).py
Backup scripts/backup final ftp.py → Backup scripts/backup ftp v.4 (final).py

But at the same time in another clone of this repository, you moved this backup script into a "Python" folder with a group of others

09abfd7 Renamed some of the files
Backup scripts/backup final ftp.py → Python/Backup scripts/backup final ftp.py

Now to resolve this conflict, you had to clean it up with two commits.

The first one just to get the file out of the right folder to the wrong folder with the right name.

8006e70 Renamed some files
Python/Backup scripts/backup final ftp.py → Backup scripts/backup ftp v.4 (final).py

Then you just lost that file with the "unneeded folder"

bac2105 Deleted an unneeded folder
deleted Backup scripts/backup ftp v.4 (final).py

Basically, it was a matter of checking out those two commits, resetting them softly to the staging area, and committing them all in one.

Then cherry-pick the rest. You can clone the straight master branch here

Procedure

git clone https://github.com/Lowe-Man/Portfolio

cd Portfolio/

git log --graph --oneline --decorate --all

 * de71d41 (HEAD -> master, origin/master, origin/HEAD) Removed a gitignore specifier from the .gitignore file * f80eb5c Added 'Lecture 26 Files' * 505478e Added 'Lecture 25 Tuples' * 632a2f3 Added 'Lecture 23 Dictionaries' * 990d74e Reorganized/Fixed all of the code/comments on all of the lectures that I have done up to this point * bb213ac Added 'Lecture 21 Lists' * ab99b1c Added 'Lecture 19 Print Formatting' * 3f37ca3 Changed the numbering of the files * 16e17be Added 'Lecture 16 Strings' * c654494 Reorganized the repository * 60b17e4 Added 'Remove Numbers v.1.py' * e35b6ba Added 'Lecture 14 Numbers' * bac2105 Deleted an unneeded folder * 8006e70 Renamed some files |\\ | * 051dae3 Rename backup final ftp.py to backup ftp v.4 (final).py * | 09abfd7 Renamed some of the files |/ * 0fa9983 Everything is in working order * dfc9747 Fixed a few if statements * e183900 Added Countdown Timers and other help to the portfolio * 2377980 Removed some unnecessary lines of code * 4172115 Added some new fetures to the script * 4a7f2d1 Fixed some minor bugs in the code * 589251c Removed text from a variable * 93e9742 Finished the backup final ftp script for now * c5687a3 Added the feature to remove files/folders that are older than a certain age * 19a495f Removed some blank lines at the bottom of the file * c2c58c3 Converts the folder to a .tar.bz2 and then deletes the folder * 6718968 Made some minor changes to the code to increase usability * b7d6608 Initial commit 

git checkout 051dae3

git reset --soft HEAD~

git status

 HEAD detached from 051dae3 Changes to be committed: (use "git reset HEAD <file>..." to unstage) renamed: Backup scripts/backup final ftp.py -> Backup scripts/backup ftp v.4 (final).py 

git checkout 09abfd7

git reset --soft HEAD~

git status

 HEAD detached from 09abfd7 Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: Backup scripts/backup ftp v.4 (final).py renamed: Backup scripts/backup final ftp.py -> Python/Backup scripts/backup final ftp.py renamed: Backup scripts/backup ftp v.1.py -> Python/Backup scripts/backup ftp v.1.py renamed: Backup scripts/backup ftp v.2.py -> Python/Backup scripts/backup ftp v.2.py renamed: Backup scripts/backup ftp v.3.py -> Python/Backup scripts/backup ftp v.3.py new file: Python/Backup scripts/backup local.py renamed: Countdown Timers/Countdown Timer (Cleaned).py -> Python/Countdown Timers/Countdown Timer v.2.py new file: Python/Countdown Timers/Countdown Timer v.3 (final).py renamed: Countdown Timers/Coutdown Timer.py -> Python/Countdown Timers/Coutdown Timer (original).py renamed: Countdown Timers/Coutdown Timer (Improved).py -> Python/Countdown Timers/Coutdown Timer v.1.py renamed: Help/How to remove zeros.py -> Python/Help/How to remove zeros.py renamed: Help/Timezone.py -> Python/Help/Timezone.py renamed: Countdown Timers/length.py -> Python/Help/length.py 

Ditch the extra copy, and move the correctly named one into the Python folder.

rm 'Python/Backup scripts/backup final ftp.py'

mv 'Backup scripts/backup ftp v.4 (final).py' 'Python/Backup scripts/backup ftp v.4 (final).py'

git add .

git status

 HEAD detached from 09abfd7 Changes to be committed: (use "git reset HEAD <file>..." to unstage) renamed: Backup scripts/backup ftp v.1.py -> Python/Backup scripts/backup ftp v.1.py renamed: Backup scripts/backup ftp v.2.py -> Python/Backup scripts/backup ftp v.2.py renamed: Backup scripts/backup ftp v.3.py -> Python/Backup scripts/backup ftp v.3.py renamed: Backup scripts/backup final ftp.py -> Python/Backup scripts/backup ftp v.4 (final).py new file: Python/Backup scripts/backup local.py renamed: Countdown Timers/Countdown Timer (Cleaned).py -> Python/Countdown Timers/Countdown Timer v.2.py new file: Python/Countdown Timers/Countdown Timer v.3 (final).py renamed: Countdown Timers/Coutdown Timer.py -> Python/Countdown Timers/Coutdown Timer (original).py renamed: Countdown Timers/Coutdown Timer (Improved).py -> Python/Countdown Timers/Coutdown Timer v.1.py renamed: Help/How to remove zeros.py -> Python/Help/How to remove zeros.py renamed: Help/Timezone.py -> Python/Help/Timezone.py renamed: Countdown Timers/length.py -> Python/Help/length.py 

In addition to everything else we renamed, the staged resolution of interest is:

  renamed: Backup scripts/backup final ftp.py -> Python/Backup scripts/backup ftp v.4 (final).py 

Make a new commit using the same message.

git commit -c ORIG_HEAD

git log --graph --oneline --decorate --all

 * 1cc1b2c (HEAD) Renamed some of the files | * de71d41 (origin/master, origin/HEAD, master) Removed a gitignore specifier from the .gitignore file | * f80eb5c Added 'Lecture 26 Files' | * 505478e Added 'Lecture 25 Tuples' | * 632a2f3 Added 'Lecture 23 Dictionaries' | * 990d74e Reorganized/Fixed all of the code/comments on all of the lectures that I have done up to this point | * bb213ac Added 'Lecture 21 Lists' | * ab99b1c Added 'Lecture 19 Print Formatting' | * 3f37ca3 Changed the numbering of the files | * 16e17be Added 'Lecture 16 Strings' | * c654494 Reorganized the repository | * 60b17e4 Added 'Remove Numbers v.1.py' | * e35b6ba Added 'Lecture 14 Numbers' | * bac2105 Deleted an unneeded folder | * 8006e70 Renamed some files | |\\ | | * 051dae3 Rename backup final ftp.py to backup ftp v.4 (final).py | |/ |/| | * 09abfd7 Renamed some of the files |/ * 0fa9983 Everything is in working order * dfc9747 Fixed a few if statements * e183900 Added Countdown Timers and other help to the portfolio * 2377980 Removed some unnecessary lines of code * 4172115 Added some new fetures to the script * 4a7f2d1 Fixed some minor bugs in the code * 589251c Removed text from a variable * 93e9742 Finished the backup final ftp script for now * c5687a3 Added the feature to remove files/folders that are older than a certain age * 19a495f Removed some blank lines at the bottom of the file * c2c58c3 Converts the folder to a .tar.bz2 and then deletes the folder * 6718968 Made some minor changes to the code to increase usability * b7d6608 Initial commit 

Now we've effectively combined commits 051dae3 , 8006e70 , and bac2105 into 09abfd7 as a new commit 1cc1b2c which is the way I think it should have functionally been committed in the first place.

So all that's left is to cherry-pick the rest of the tree starting from e35b6ba Added 'Lecture 14 Numbers'

git cherry-pick e35b6ba^..de71d41

git log --graph --oneline --decorate --all

 * 0e52036 (HEAD) Removed a gitignore specifier from the .gitignore file * 1cf948b Added 'Lecture 26 Files' * 62a1602 Added 'Lecture 25 Tuples' * aeb7421 Added 'Lecture 23 Dictionaries' * d47635d Reorganized/Fixed all of the code/comments on all of the lectures that I have done up to this point * d54141c Added 'Lecture 21 Lists' * 66174f2 Added 'Lecture 19 Print Formatting' * 3969da2 Changed the numbering of the files * 9c4828c Added 'Lecture 16 Strings' * ce159a3 Reorganized the repository * 759e08b Added 'Remove Numbers v.1.py' * 323be27 Added 'Lecture 14 Numbers' * 1cc1b2c Renamed some of the files | * de71d41 (origin/master, origin/HEAD, master) Removed a gitignore specifier from the .gitignore file | * f80eb5c Added 'Lecture 26 Files' | * 505478e Added 'Lecture 25 Tuples' | * 632a2f3 Added 'Lecture 23 Dictionaries' | * 990d74e Reorganized/Fixed all of the code/comments on all of the lectures that I have done up to this point | * bb213ac Added 'Lecture 21 Lists' | * ab99b1c Added 'Lecture 19 Print Formatting' | * 3f37ca3 Changed the numbering of the files | * 16e17be Added 'Lecture 16 Strings' | * c654494 Reorganized the repository | * 60b17e4 Added 'Remove Numbers v.1.py' | * e35b6ba Added 'Lecture 14 Numbers' | * bac2105 Deleted an unneeded folder | * 8006e70 Renamed some files | |\\ | | * 051dae3 Rename backup final ftp.py to backup ftp v.4 (final).py | |/ |/| | * 09abfd7 Renamed some of the files |/ * 0fa9983 Everything is in working order * dfc9747 Fixed a few if statements * e183900 Added Countdown Timers and other help to the portfolio * 2377980 Removed some unnecessary lines of code * 4172115 Added some new fetures to the script * 4a7f2d1 Fixed some minor bugs in the code * 589251c Removed text from a variable * 93e9742 Finished the backup final ftp script for now * c5687a3 Added the feature to remove files/folders that are older than a certain age * 19a495f Removed some blank lines at the bottom of the file * c2c58c3 Converts the folder to a .tar.bz2 and then deletes the folder * 6718968 Made some minor changes to the code to increase usability * b7d6608 Initial commit 

Now we can delete our old master branch, use this one as the new master, and force push to the remote.

git branch -d master

git checkout -b master

git push origin master --force

git log --graph --oneline --decorate --all

 * 0e52036 (HEAD -> master, origin/master, origin/HEAD) Removed a gitignore specifier from the .gitignore file * 1cf948b Added 'Lecture 26 Files' * 62a1602 Added 'Lecture 25 Tuples' * aeb7421 Added 'Lecture 23 Dictionaries' * d47635d Reorganized/Fixed all of the code/comments on all of the lectures that I have done up to this point * d54141c Added 'Lecture 21 Lists' * 66174f2 Added 'Lecture 19 Print Formatting' * 3969da2 Changed the numbering of the files * 9c4828c Added 'Lecture 16 Strings' * ce159a3 Reorganized the repository * 759e08b Added 'Remove Numbers v.1.py' * 323be27 Added 'Lecture 14 Numbers' * 1cc1b2c Renamed some of the files * 0fa9983 Everything is in working order * dfc9747 Fixed a few if statements * e183900 Added Countdown Timers and other help to the portfolio * 2377980 Removed some unnecessary lines of code * 4172115 Added some new fetures to the script * 4a7f2d1 Fixed some minor bugs in the code * 589251c Removed text from a variable * 93e9742 Finished the backup final ftp script for now * c5687a3 Added the feature to remove files/folders that are older than a certain age * 19a495f Removed some blank lines at the bottom of the file * c2c58c3 Converts the folder to a .tar.bz2 and then deletes the folder * 6718968 Made some minor changes to the code to increase usability * b7d6608 Initial commit 

Answer 2

With providing your source code, I was able to do the following steps to your current repo, with @jpaugh 's answer in mind, In order to get the exact same code as you began with. The reason you are having trouble with @jpaugh 's answer is because we have remove/remove merge conflicts that we have to manual resolve.

Because you already resolved this merge conflict, we are going to do exactly what you did to resolve it the first time.

Grab the branch you want to change the history of.

git checkout origin/master

We are going to rebase a commit that is before your merge. By default, rebase doesn't preserve merge history, so this will replay your work linearly from that commit to where your origin/master is.

git rebase 0fa9983

But we have some problems. The merge in history has a remove/remove conflict that you had resolved. Let's add the changes you made in the resolve commit 8006e70 and the branch 051dae3 to mimic that you made them immediately following the other branch, not in parallel.

git checkout 8006e70 Backup\ scripts/backup\ ftp\ v.4\ \(final\).py
git rm Backup\ scripts/backup\ final\ ftp.py
git rm Python/Backup\ scripts/backup\ final\ ftp.py

So now we are going to commit our changes as a new commit, but let's use the C tag to give it the same commit message as the merged commit we are replacing. Use the hash of the branch we want the message from.

git commit -C 051dae3

Let's use the continue command, to continue rebasing.

git rebase --continue

We have a new problem, and that is we merged two commits into one (the merge and branch). It is still trying to be played out in continuing the rebase. If we had used the -i tag for our original rebase command, we could have indicated we should skip this commit, but this example is all command line. We are going to skip it here. It failed here because all the changes that it made have already happened. We chose to have the commit message in the branch, not the short renamed some files message, so your intentions are clear when you look at our new history. Go ahead and skip this conflict, allowing the rebase to continue through the rest of history.

git rebase --skip

We don't have any more rebasing left. The function has exited. Now we have a detached head that has a linear commit history. Let's check if we succeeded in recreating history, but keeping the files the same.

git diff origin/master

The last diff shows there are no changes to your files, just the history. This produces the following history:

$ git log --oneline --graph
* e8eec78 Removed a gitignore specifier from the .gitignore file
* 2d51522 Added 'Lecture 26 Files'
* 93f6908 Added 'Lecture 25 Tuples'
* 2b3d9c5 Added 'Lecture 23 Dictionaries'
* a8bcfaa Reorganized/Fixed all of the code/comments on all of the lectures that I have done up to this point
* f3d0448 Added 'Lecture 21 Lists'
* 7ce1af4 Added 'Lecture 19 Print Formatting'
* 740f459 Changed the numbering of the files
* da6f679 Added 'Lecture 16 Strings'
* 2d4abf6 Reorganized the repository
* 1d88453 Added 'Remove Numbers v.1.py'
* 85cda36 Added 'Lecture 14 Numbers'
* 3d89d1a Deleted an unneeded folder
* bc41dc6 Rename backup final ftp.py to backup ftp v.4 (final).py
* 52a1354 Renamed some of the files
* 0fa9983 Everything is in working order
* dfc9747 Fixed a few if statements
* e183900 Added Countdown Timers and other help to the portfolio
* 2377980 Removed some unnecessary lines of code
* 4172115 Added some new fetures to the script
* 4a7f2d1 Fixed some minor bugs in the code
* 589251c Removed text from a variable
* 93e9742 Finished the backup final ftp script for now
* c5687a3 Added the feature to remove files/folders that are older than a certain age
* 19a495f Removed some blank lines at the bottom of the file
* c2c58c3 Converts the folder to a .tar.bz2 and then deletes the folder
* 6718968 Made some minor changes to the code to increase usability
* b7d6608 Initial commit

Notice how the commit hashes have changed? This is because the history has changed. If you want to propagate this back to your origin/master, you need to force it. This is because pushes fail if the history hashes don't match, and we just changed the majority of our history hashes.

Do git push --force origin/master if you want to propagate those changes upstream.

Remember that other people could have forked your remote if it is public facing, and that it is best practise to not change git history if others have access to those commits.

$ git --version
git version 2.9.0

Answer 3

The reason your history is like this is because you created a new branch at some point, then merged it back in. (Or someone else did.)

If you're using GitHub, then it could also mean you accepted a pull-request, which is tantamount to a merge. If so, there is no way around this, in general. From their point of view, this is a reasonable choice, as merging is more robust than rebasing, and preserves authorship changes better: we just have to live with uglier log output. In that case, you can stop reading here.

---

I don't know of an automated way to change this, but I can show you how to rebase your commits to the way you want. That involves rewriting the history from the point of the mistake all the way to the HEAD , creating different commits with the same content.

However, I noticed that the branch you're looking at is not a local branch, but the origin branch for your local copy (assuming usual Git convention here). I understand the desire for clean and pretty log output, however, there is a practical reason not to rebase old history:

Warning: Although it is possible to rebase your commits locally , it is not a good idea to push such changes to a public project. Rebasing your history always causes problems for others with whom you've shared the unmodified history. So, anyone else involved with your project will be hosed.

---

With that warning, here goes:

1. First, make a copy of your repository, so that you have a backup. (A rebase command never loses data, but if you're unfamiliar with the rebase command, it can be hard to get back to a known state if you make a mistake or change your mind.)
2. Check out a new branch based on origin/master , since you can't modify it directly ( git checkout -b new-master origin/master )
3. Next, do a git rebase --interactive <commitish> where <commitish> identifies the commit labeled "Everything is in working order" (0fa9).
4. The rebase operation will now open up in your editor, for your approval.
5. The first line will be the one called "Renamed some of the files" (09ab). Change its action from pick to edit .
6. Save the file and close it. The rebase operation will begin.
7. When the rebase stops after the first commit, git cherry-pick <commitish> where <commitish> describes the commit called "Rename backup file ftp.py to ...".
8. git rebase --continue
9. Verify the results. You'll notice that every commit has a different ID now, despite having the same description, and same content (diff). This is because you have written a new history with the old changes. The commit date will have changed, but not the authorship date.

Now, if you want to inflict others with your new history, you can do so by pushing these changes to your origin repository:

$ git push --force origin/master

The --force is required because this will overwrite the existing branch, and invalidate any branches made from that, including the local repository of all contributors.