On May 2, 7:24 pm, Charles Manning wrote:
> If you're old enough you might remember VAX VMS. One really neat feature that
> this had was file versioning that made it really easy to revert a few edits
> back.
>
> I was trying to something like this in git storing each file after an edit
> with
>
> $ git commit -a -m "wip $(date)"
>
> After a few edits you end up with a log that looks like:
>
> $ git log --oneline
> d7f2462 wip Mon May 3 11:40:09 NZST 2010
> a744bf9 wip Mon May 3 11:40:09 NZST 2010
> cd27722 wip Mon May 3 11:40:08 NZST 2010
> 4130b3b wip Mon May 3 11:40:08 NZST 2010
> 3ab5dc6 wip Mon May 3 11:40:06 NZST 2010
> 0f0a662 wip Mon May 3 11:39:42 NZST 2010
> 25669f0 Add starting point file x
>
> I can then do a git rebase -i and squash all the wips
>
> and end up with
>
> $ git log --oneline
> fd041b4 wip Mon May 3 11:39:42 NZST 2010
> 25669f0 Add starting point file x
>
> Then do a git commit --amend and change the commit message.
>
> $ git log --oneline
> 3a770a7 finally fixed
> 25669f0 Add starting point file x
>
> That's all very manual.
>
> Is there some easier way?
You want "git reset --soft":
git reset --soft 25669f0
git commit
--
Chris
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
