On Thu, Jul 12, 2007 at 02:59:53PM +0100, Johannes Schindelin wrote:
> In this case, "messy history" means that there are tiny patches which are
> often in the wrong order, or should be squashed into one commit. "git
> rebase -i upstream" presents you with the list of A - HEAD, and you can
> reorder the patches. If you want to, you can combine ("squash") some
> into one commit, or you can skip it, by removing the corresponding line.
If I squash a whole series of commits, how do I prevent git-rebase -i
from firing up an editor after every single commit in the series?
Also, if I do the following:
bash-3.00$ git init
Initialized empty Git repository in .git/
bash-3.00$ for i in a b c; do touch $i; git add $i; git commit -m $i -a; done
Created initial commit 19a8485: a
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 a
Created commit 4a00f85: b
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 b
Created commit defe3b5: c
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 c
bash-3.00$ git rebase -i HEAD~2
and then replace the second "pick" by "squash", then I get presented
a commit message that contains the commit message of "c" twice and
after the rebase there are still three commits in the history.
This is with git version 1.5.3.rc1.10.gae1ae
(on top of v1.5.3-rc1-4-gaf83bed).
skimo
-
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
