git-history | Quickly browse the history of a file from any git repository

I've been reading an article over here: https://medium.com/anitab-org-open-source/how-i-managed-to-not-mess-up-my-git-history-thanks-to-git-pull-rebase-fed452c661f0

Based on my understanding she's got the following structure (excuse me for the rough sketch):

She states the following problem:

What if X approved task 2 and merged it first then review task1 and merged it after? Remember that task 1 has no additional codes that task 2 has since it was the preceding task. To make more sense, think of it with task 2 as the Register functionality and task 1 as the basic setup. Basic setup branch won’t have the Register files since I didn’t write that functionality on task 1. If this task 1 branch is to be merged after task 2, wouldn’t it cancell out (delete) the register folder/file that got merged by task 2 from the first merge? How can we prevent this?

This is the sentence that boggles my mind:

"If this task 1 branch is to be merged after task 2, wouldn’t it cancell out (delete) the register folder/file that got merged by task 2 from the first merge?"

AFAIK, if task2 is merged to master, it'll take that entire path that connects it uptil master and merges all that to master.

task1 would only have 2 commits that aren't merged with master (consider those slashes to be commit ids). If we merge task1 afterward, it shouldn't have any problems whatsoever.

Or, if task#1 didn't have any extra commits then merging task#1 wouldn't lead to any problems, isn't it?

It's not like commits will be "canceled out" or "deleted" if we merge task1. Correct?

I'm currently trying to purge some sensitive secret files from a private repository in GitHub.

I found the following StackOverflow post How to remove file from Git history? - where I am told to run the following command.

I had some intractable git-history related issues in my current (Rails) code repo, whose remote origin on Github is "V1.git"

Thanks to help in another SO thread, I made an all-new repo with the issues fixed, and pushed the master branch of the new (fixed) repo to a new Github repo named "V2.git". FWIW, the files at the "HEAD" of both V1 and V2 are the same, but, if it matters, the most recent commit IDs are not the same and V2 also has a lot more git history.

How can I force-overwrite V2 from Github to my development folder MYAPP, while leaving all untracked files alone?

I'm guessing I probably:

• in MYAPP, delete the current remote "origin" (points to V1)
• and also probably delete the .git folder,
• then simply clone V2 into the existing MYAPP folder where it will leave untracked file alone?

Or perhaps should I:

• in MYAPP, delete the current remote "origin" (points to V1)
• and delete the .git folder
• then add the new remote "origin" (points to V2)
• then do git init
• then something like git pull origin master ?

Or perhaps it is as simple as adding "origin" to point to V2, then doing some sort of forced git-pull?

This is the size of my .git folder:

I'm trying to clean up a git repository of latex code that contains the generated pdf files, because these files have caused the repo to balloon up to a size of 300mb.

Adapting a bit from the answer here How to remove file from Git history?. I tried the following command:

git filter-branch -f --index-filter 'git rm --cached --ignore-unmatch *.pdf' HEAD

This reduced the size a little, but not as much as i'd hoped. When I then try the script found in the answer to this question: How to find/identify large commits in git history?, to find which files contribute to the size, it still shows several pdf files. However, if i try the script found in this question: Which commit has this blob?, it cannot find any commit that contains the file.

I have removed all branches except the local branch. I have not pushed the changes to the remote.

Is there any reason these files would still persist in the history somewhere? What other things can I try?

I use vscode. Sometimes I seem to click or type something accidentally and a timeline view (similar to the one described in How can I view the Git history in Visual Studio Code?) appears.

How do I close the timeline view?

I thought the option to hide the timeline would be in View > Appearance but I can't see any references to 'timeline' history' 'commits' etc.

Right now I just close the file and reopen it but I'm sure there's a proper solution/

I have a question similar to this one but with the availability of filter-repo I wonder if there is a better approach now.

I have a large-ish repo with a few problematic commits that I want to clean up via rewriting history (I will not be pushing back to origin, this will be the new 'master' repo going forward, the original will remain as-is in read-only mode in perpetuity).

There are a number of commits where a file has been replaced with a large binary file. There are corresponding commits that fix the problem by re-instating the non-binary file.

Given a set of these commit pairs, I could conceivably use rebase -i to manually fixup the commits. But there are many commits, and I want a scriptable solution. Can filter-repo be used to accomplish this? I can imagine using --commit-callback and checking the filenames in the file_changes, but I also need to check the size to determine if this commit is one of the problematic ones.

I managed to get a custom button added to the Git history context menu thanks to the help offered here.

I'm continuing work at the same extension and am again stuck. Once the button I've added to the context menu is clicked I need to get a reference to the commit that is selected when it is clicked. The idea is that I then need to grab the code changes associate with that commit.

I've gotten as far as getting a reference to the ActiveWindow which has a caption of "History - master". Which makes me believe I'm close. However, ActiveWindow.Selection is null. So I'm not sure where to go next to get the selected commit.

This is what I'm using to get the ActiveWindow property.

How to copy one repo entirely to another repo with history.

I don't want to use fork or mirroring options, I tried out branch-filter options but it is limited to one directory. git filter-branch --subdirectory-filter /../RepoA/dire1

I was referring below url https://medium.com/@ayushya/move-directory-from-one-repository-to-another-preserving-git-history-d210fa049d4b/