Questions tagged [git-interactive-rebase]
65 questions
0
votes
1 answer
git, rebase v interactive rebase, git directory strucuture
When I do git rebase , I see the directory .git/rebase-apply is created containing the files onto, orig-head, and original-commit, referencing , head, and the current commit being applied respectively.
When I do git rebase…
junvar
- 11,151
- 2
- 30
- 46
0
votes
1 answer
Clean up common commits before final merge of octopus
I am helping with integration of a long-running project back into the mainline. One of the feature branches that wants to come back is itself an octopus merge of (not a single octopus merge, but several merges over time) many other "mini-feature"…
Chris Cleeland
- 4,760
- 3
- 26
- 28
0
votes
1 answer
Rewriting committed code in Git
I have a git repo that I have decided to make public, which means moving database connection info into a .gitignored file. However, my repository history still contains the commits that I added and then removed the information.
I have tried the…
diplosaurus
- 2,538
- 5
- 25
- 53
-1
votes
1 answer
How can I move changes to a file from one commit to another?
How can I directly edit git history as to "drag 'n drop" changes from one commit to another?
Within a branch I have three commits:
A--B--C
The contents of which are:
A -- add file_a
B -- add file_b
mod file_a
C -- mod file_b
Currently I can…
Drewzillawood
- 3
- 2
-1
votes
2 answers
Questions on Git/Vim interactions
I have the following screen and need the necessary commands to merge 2 commits.
elad
- 19