Questions tagged [fixup]
Use fixup for questions related to an assembler opcode which references an external symbol using a default address to represent an unknown address which is subsequently replaced with an actual numeric address when that information is known.
fixup
16
questions
0
votes
0
answers
390
views
Adding a .size attribute to nodes in Red-Black Binary tree (Pseudo code)
In my CS class I've been given the task to add a size attribute to nodes in a Red-Black Binary tree. The size of a node, is the number of nodes in its sub trees.
This attribute has to be updated, when ...
2
votes
3
answers
171
views
Git - Is it safe to rebase while main IDE is open?
I'm someone which often rebases feature-related commits for fixing them up. Lately I've been concerned in whether having the main coding IDE open can affect something going wrong in the rebase process....
- 65
0
votes
1
answer
201
views
How does git keep track of the commit hash marked with a fixup/squash flag?
I know that git commit --fixup <commit A's hash> can make a commit B that will be combined with commit A, when executing git rebase -i --autosquash.
And when I run git log, my commit log looks ...
- 98
4
votes
1
answer
333
views
Does git have a shortcut command to fix up HEAD into HEAD~1
I find myself doing this sometimes:
git rebase -i HEAD~2
This shows me two commits, HEAD~1 and HEAD. I change pick to f to fix up HEAD into HEAD~1. Now I combined my two most recent commits into a ...
- 185
6
votes
4
answers
2k
views
Programmatically fixup last commit into previous
Every time I want to fixup my latest commit into the second latest commit, I do this
git rebase HEAD~2 -i
<replace pick with fixup on line 2>
Is there a way to do this in an automated script, ...
- 36.8k
2
votes
2
answers
2k
views
Is it possible to easily move all commits from one branch onto another as one commit? [duplicate]
I know, I can do an interactive rebase, reword first commit and fixup all other. But if a branch contains hundreds of commits it becomes very tedious.
Is there a simpler way?
- 3,173
2
votes
0
answers
3k
views
64 bit assembly fixup error
I'm trying to run a test program the prof gave us for 64- bit assembly, and it's not worker properly.
the error is:
error LNK2017: 'ADDR32' relocation to 'naturals' invalid without /LARGEADDRESSAWARE:...
- 67
6
votes
3
answers
3k
views
git rebase -i -autosquash conflict
git is giving me a major headache when using --fixup and --autosquash.
I would like to give two examples, one working perfectly fine and the other being a mess. (git version 2.6.2)
Working example:
...
- 63
3
votes
1
answer
633
views
Non-interactive fixup until specified hash
Let’s say I have hour commits
* 7bd4815 (HEAD) four
* afe9410 third
* db064dd second
* 46ab932 first
There are no uncommitted changes. What I want to do is non-interactively squash everything after ...
- 5,574
2
votes
2
answers
442
views
Entity Framework 4 entity with storegeneratedpattern = none doesn't update foreign keys when saved
I have an entity that has an int as its primary key that is set to storegeneratedpattern = none so that we provide the id client side.
This entity has child entities that reference back to it via ...
- 97
201
votes
8
answers
102k
views
What's the difference between "squash" and "fixup" in Git/Git Extension?
I've been using Git Extensions for a while now (it's awesome!) but I haven't found a simple answer to the following:
Sometimes, when typing a commit message, a make a typo. My friend showed me how to ...
- 5,088
3
votes
1
answer
2k
views
EF anonymous object query returns null collections instead of empty ones
I'm using this trick to perform conditional Include's with EF. http://blogs.msdn.com/b/alexj/archive/2009/10/13/tip-37-how-to-do-a-conditional-include.aspx
The problem I'm having is that any ...
- 33
0
votes
1
answer
661
views
red black fixup
I have implemented a red black tree, but it doesn't work well. It inserts the nodes not on the correct way. I think it's so because of FixUp. Does anyone know where am i wrong?
When i insert (1, 4, 9, ...
- 105
1
vote
1
answer
1k
views
Should I rip out the Association Fixup code from my Entity Framework T4 Template?
Can someone clarify my thinking on association fixup code in Entity Framework (T4 generated POCOs) please?
A recent comment regarding fix-up stated 'For example code-first doesn't use them and ...
- 1,472
3
votes
2
answers
1k
views
What does "vtable fixup" mean?
I have heard this term, "vtable fixup", used. What does it mean? I had no success asking Google. I already know what a vtable is so that does not need to be defined.
- 33