modify git history | Together Java | Page 1

fleet vortex Aug 31, 2023, 1:16 PM

#

hello I am maintaining a repository on github which I rebased last week, I am currently trying to undo this rebase to restore the commit history but I am unable to achieve this

grizzled haloBOT Aug 31, 2023, 1:16 PM

#

<@&987246964494204979> please have a look, thanks.

grizzled haloBOT Aug 31, 2023, 1:16 PM

#

grizzled halo <@&987246964494204979> please have a look, thanks.

#

While you are waiting for getting help, here are some tips to improve your experience:

Code is much easier to read if posted with syntax highlighting and proper formatting.

If nobody is calling back, that usually means that your question was not well asked and hence nobody feels confident enough answering. Try to use your time to elaborate, provide details, context, more code, examples and maybe some screenshots. With enough info, someone knows the answer for sure.

Don't forget to close your thread using the command </help-thread close:1027500463647621170> when your question has been answered, thanks.

fleet vortex Aug 31, 2023, 1:17 PM

#

I have made a seperate branch which I called test and hard reset to the commit d3dfe5b364d379dda65997036bc2edd154811350 right before the rebase

#

this is the currenty history on the original dev branch:

#

the last commit of #42 is the state I was able to restore on my test branch

cunning egret Aug 31, 2023, 1:18 PM

#

hi

fleet vortex Aug 31, 2023, 1:18 PM

#

HEY

#

now if I want to move any higher up the commits I wipe this entire history because of the rebase

#

is there any way to just exclude that one rebase from the history and keep the original commits

cunning egret Aug 31, 2023, 1:19 PM

#

yeah

#

by using rebase interactive

fleet vortex Aug 31, 2023, 1:19 PM

#

i found this aswell so far

#

ok wait

#

let me pull up my history

#

I found that I can do "git rebase -i HASH" where hash is the hash of the commit of the rebase?

#

but I dont know what todo inside the window to achieve this

cunning egret Aug 31, 2023, 1:20 PM

#

before we start make sure you have a core.editor property in your git global config

fleet vortex Aug 31, 2023, 1:20 PM

#

what is that for?

#

and what value does it need

cunning egret Aug 31, 2023, 1:20 PM

#

is to help you change the history

#

you'll get your commits written on a file with some tips

#

you change the file, save it and close the editor

fleet vortex Aug 31, 2023, 1:21 PM

#

where and how do I add this property, is it .git/config ?

cunning egret Aug 31, 2023, 1:21 PM

#

no

fleet vortex Aug 31, 2023, 1:21 PM

#

oh wait global config, one moment let me figure this out

cunning egret Aug 31, 2023, 1:22 PM

#

do you have at least notepad++?

fleet vortex Aug 31, 2023, 1:22 PM

#

i have a git bash, notepad++ vim

#

whatever I need

cunning egret Aug 31, 2023, 1:22 PM

#

git bash will open an editor in terminal, you need to be aware of how to save it when you finish

fleet vortex Aug 31, 2023, 1:22 PM

#

i assume :wq

cunning egret Aug 31, 2023, 1:23 PM

#

im windows user

fleet vortex Aug 31, 2023, 1:23 PM

#

alright, I'll just use the tools you are familiar with because I dont know how to solve this and ive been stuck for 3 hours

#

which tools do you use I'll get those then instead

cunning egret Aug 31, 2023, 1:24 PM

#

install notepad or something equivalent

fleet vortex Aug 31, 2023, 1:24 PM

#

ok got that

cunning egret Aug 31, 2023, 1:24 PM

#

are you on windows ?

fleet vortex Aug 31, 2023, 1:24 PM

#

yes sir

cunning egret Aug 31, 2023, 1:24 PM

#

use powershell

fleet vortex Aug 31, 2023, 1:24 PM

#

opened

cunning egret Aug 31, 2023, 1:25 PM

#

check your git global config with git config --global -l

fleet vortex Aug 31, 2023, 1:25 PM

#

[email protected]
user.name=hawolt
user.signingkey=redacted
commit.gpgsign=true```
alright theres no core.editor

grizzled haloBOT Aug 31, 2023, 1:25 PM

#

fleet vortex ``` [email protected] user.name=hawolt user.si...

Detected code, here are some useful tools:

cunning egret Aug 31, 2023, 1:26 PM

#

that means you don't have a config for core editor

fleet vortex Aug 31, 2023, 1:26 PM

#

what value does it need

#

i assume I just do git config --global core.editor xyz

cunning egret Aug 31, 2023, 1:27 PM

#

no

#

the value next to core.editor

#

should be inside quotes "<value>"

fleet vortex Aug 31, 2023, 1:27 PM

#

yeah but what value do I have to put?

cunning egret Aug 31, 2023, 1:27 PM

#

https://www.theserverside.com/blog/Coffee-Talk-Java-News-Stories-and-Opinions/How-to-set-Notepad-as-the-default-Git-editor-for-commits-instead-of-Vim#:~:text=Changing the Git editor to Notepad%2B

How to set Notepad++ as the Git editor instead of Vim

Frustrated every time you forget to add a Git commit message and Vim, the default Git editor pops up? Here's a way to make issuing git commits a bit friendlier. In this Git tutorial, we show you ...

#

check this example

fleet vortex Aug 31, 2023, 1:28 PM

#

oh this config is

#

okok i get what this config is for

#

let me set it to notepad++

#

ok done

#

got it configured to notepad++

cunning egret Aug 31, 2023, 1:29 PM

#

cunning egret check your git global config with `git config --global -l`

again pls

fleet vortex Aug 31, 2023, 1:29 PM

#

git config --global -l
[email protected]
user.name=hawolt
user.signingkey=redacted
commit.gpgsign=true
core.editor=C:/Program Files/Notepad++/notepad++.exe

grizzled haloBOT Aug 31, 2023, 1:29 PM

#

fleet vortex ``` git config --global -l [email protected] u...

Detected code, here are some useful tools:

cunning egret Aug 31, 2023, 1:29 PM

#

now in your git repo

#

use git rebase -i

#

you have to define the number of commits

fleet vortex Aug 31, 2023, 1:30 PM

#

let me put my test branch up to date with dev

cunning egret Aug 31, 2023, 1:30 PM

#

like this

fleet vortex Aug 31, 2023, 1:30 PM

#

so i dont mess anything up

#

one minute

cunning egret Aug 31, 2023, 1:30 PM

#

cunning egret like this

git rebase -i HEAD~<number_of_commits_you_want_to_backup>

#

like this git rebase -i HEAD~2

fleet vortex Aug 31, 2023, 1:31 PM

#

ok wait theres alot of commits

#

i need to figure out how many it is

cunning egret Aug 31, 2023, 1:31 PM

#

if you have merges the command would need additional keyword

fleet vortex Aug 31, 2023, 1:32 PM

#

theres merges from pull requests yes

#

maybe its easier if i just link it?

#

so i dont exclude something that might be important

#

since I dont know whats needed

#

https://github.com/hawolt/custom-league-client/commits/test

GitHub

Commits · hawolt/custom-league-client

Contribute to hawolt/custom-league-client development by creating an account on GitHub.

cunning egret Aug 31, 2023, 1:32 PM

#

if you have merges and want to manipulate them as well

cunning egret Aug 31, 2023, 1:33 PM

#

cunning egret if you have merges and want to manipulate them as well

do you ?

fleet vortex Aug 31, 2023, 1:33 PM

#

theres been merges from various pull requests

#

I dont want to manipulate those

#

I only want to get rid of the rebase I did

#

last week

cunning egret Aug 31, 2023, 1:33 PM

#

then no need to touch them

#

let me see the repo

fleet vortex Aug 31, 2023, 1:33 PM

#

check the test branch

#

thats where I do it on

#

the rebase happened here with fix game launching

cunning egret Aug 31, 2023, 1:34 PM

#

you want to go back there ?

fleet vortex Aug 31, 2023, 1:35 PM

#

wait mabye im even using wrong wording

#

if you click on #42 for example

#

it has alot of commits

#

i want them to be visible in the history

#

rather than just one commit that sums it all up

#

i mangaged todo it to the point of the last commit in #42

cunning egret Aug 31, 2023, 1:36 PM

#

ahaa

fleet vortex Aug 31, 2023, 1:36 PM

#

but if i go any further

#

it goes back to this state

#

because something happened? i think it was a rebase

#

my community told me todo it

#

and now it always accredits all amount of lines to everyone that contributed in the big squash/merge/base

#

i dont really know the words im learning how to use git

#

😭

#

git fetch -u origin dev 84977829beec6810504582fe53af5a555f70ad6c
git reset --hard 84977829beec6810504582fe53af5a555f70ad6c
git push -f -u origin test

if i do this then I have my full and exact history up until august 22

grizzled haloBOT Aug 31, 2023, 1:37 PM

#

fleet vortex ``` git fetch -u origin dev 84977829beec6810504582fe53af5a555f70ad6c git reset -...

Detected code, here are some useful tools:

cunning egret Aug 31, 2023, 1:37 PM

#

if those commits were done previously

fleet vortex Aug 31, 2023, 1:37 PM

#

thats how far i came so far

cunning egret Aug 31, 2023, 1:38 PM

#

if the commits you're talking about were squashed into one

#

you can still see them in git

fleet vortex Aug 31, 2023, 1:38 PM

#

yeah the problem with the squashing is uh

#

if i add 3k lines

#

and another person in the squash added 1 line

#

we both get +3001 lines

#

as a contributor

#

i inflated everyones numbers this way

#

I owuld like to fix that

#

#

everyone got 3074 because they were included in the squash

#

is there any way to undo that squash?

cunning egret Aug 31, 2023, 1:40 PM

#

yes

#

you can do anything u want with git

fleet vortex Aug 31, 2023, 1:40 PM

#

yeah well! you just need to know how

#

thats where i fail

#

i managed to unsquash all up until aug 22, by just hard resetting to some point

#

but then i dont know how to pull in the rest

cunning egret Aug 31, 2023, 1:41 PM

#

https://stackoverflow.com/a/10260246/10000150

#

maybe this will help

fleet vortex Aug 31, 2023, 1:41 PM

#

ohhhhhhhhhhh

#

wait maybe yes

#

i just point the thing somewhere else

#

so it skips that part?

#

i had that open earlier but it confused me more

#

so i just closed that tab

cunning egret Aug 31, 2023, 1:42 PM

#

AFAIK you need git reflog

#

im not used to with this sorry

fleet vortex Aug 31, 2023, 1:43 PM

#

#

yeah i can see the rebase in the history

#

ill see what i can do with this

#

in git reflog*

cunning egret Aug 31, 2023, 1:44 PM

#

https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog

Atlassian

Git Reflog Configuration | Atlassian Git Tutorial

Reflogs track Git refs updated in the local repository. In addition, branch tip reflogs, a special reflog is maintained for the Git stash. Learn more.

#

read more here

#

there is an example how to restore squashed commit(s)

fleet vortex Aug 31, 2023, 1:50 PM

#

yeah thats basically what I did with my hard reset

#

the problem is that there have been commits happening after this

#

this example works fine

#

but then I still lose all the commits that happened after to where I reset to

#

#

like right now I am on the last commit of #42 before everything was squashed

#

actually nevermind, every pull request i merged was also squashed

#

#19 aswell

cunning egret Aug 31, 2023, 1:54 PM

#

in that case you may need to add a keyword

#

git rebase -i -r HEAD~<commit_id>

fleet vortex Aug 31, 2023, 1:58 PM

#

what exactly am i ment to edit in the rebase

#

everything is marked as pick

cunning egret Aug 31, 2023, 1:59 PM

#

yeah pick means: the rebase will pick all those commits

#

you can change that pick with something else

#

you can see a list of options below

fleet vortex Aug 31, 2023, 1:59 PM

#

yeah

#

but how does this help recover that history

cunning egret Aug 31, 2023, 2:00 PM

#

you can see the commits you're looking for right ?

fleet vortex Aug 31, 2023, 2:01 PM

#

yes

#

its the commit right before the dissapear

cunning egret Aug 31, 2023, 2:01 PM

#

I dnt see anything would you like to show what you see rn ?

fleet vortex Aug 31, 2023, 2:02 PM

#

#

im using vim

#

but thats the rebase window

#

i can move on to the next file

#

but i dont really understand whats happening

cunning egret Aug 31, 2023, 2:03 PM

#

did you recover the squashed commits ?

fleet vortex Aug 31, 2023, 2:03 PM

#

fleet vortex

well they dont appear to be squashed from what i can see here

cunning egret Aug 31, 2023, 2:03 PM

#

hmm

#

but how ? haha

#

tell me about one of them which one ?

fleet vortex Aug 31, 2023, 2:05 PM

#

one moment

#

i see the entiry commit history except for merges / prs

#

#

if I add the -r you told me to the rebase i get an error

#

wait

#

oh wait

#

#

ok now i see it

#

or do i have to modify this on the main branch

#

when i open this in rebase

#

all i see is

#

need to leave for today, if anyone else has an idea how to recover all commits from the squashed merges within an active history please let me know

cunning egret Aug 31, 2023, 2:23 PM

#

i think you need to add something in your rebase command

#

maybe this would help

#

git rebase -i --root -r HEAD~<commit_id>

#

im going to try it out

fleet vortex Aug 31, 2023, 2:28 PM

#

cant do more for today, I will try this tomorrow morning and report back

#

thanks alot for the help so far ❤️

cunning egret Aug 31, 2023, 2:29 PM

#

alright, keep me updated

#

im interested

#modify git history