Hi Everyone,
I was fooling around with 'git filter-branch --env-filter ...' trying to
update the timestamps on my commits (which worked), but now when I run
'git whatchanged -p master..' shows all changes to the entire project, not
the differences between my branch and the master branch.
Being a novice git user, I'm not sure how much to trust that I didn't hose
git in some really weird way, leaving it in a state where it doesn't quite
work the way it did before.
The contents of .git/refs/original/refs/heads/ shows a file with my branch
name which contains only one entry (presumably the one I updated the
timestamp on) so I feel pretty sure that only the commit I wanted to change
actually changed. However, the fact that 'git whatchanged -p' now behaves
differently makes me worry.
Nothing went wrong during my update, however, I forgot to give a range
label so it searched the entire project. In theory nothing should have
changed, but...
Ultimately, my worry is that I polluted the history which I cloned, and
pushing that would make people unhappy.
I can still get to my patches, so I can still do a fresh pull and reapply
all my changes again, as a last resort, but I'd rather not if I don't
have to.
So my questions are:
1) Is this a problem with an easy fix?
2) If not, can I back out my change?
3) Is git push --dry-run the best way to find out what I changed? Is there
a better way to see what will be pushed?
4) Is there a better way to update the timestamps of my commits so that my
patches will appear as a solid block of commits in the history (as that
is how they will be committed), not interleaved with other changes in
the past (giving the false impression that they were applied to the
master tree when they were not)?
Thanks in advance,
Mike
(:
--
--------Mike@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html