This link has been bookmarked by 44 people . It was first bookmarked on 09 Apr 2008, by Jeremy James.
-
31 Mar 11
-
13 Oct 10
-
14 Sep 10
-
25 Jul 10
-
15 May 10
-
29 Mar 10
-
24 Feb 10
-
27 Dec 09
-
26 Sep 09
-
21 Jul 09
-
01 Jun 09
-
14 Apr 09
-
06 Feb 09
-
03 Feb 09
-
27 Jan 09
-
05 Dec 08
-
19 Nov 08
-
19 Oct 08
-
13 Oct 08
-
What the small help doesn't say is that you can actually reorder your commits, and it will do what you expect it to do. I used it 10 minutes ago, because I have this string buffer module I extend on a regular basis, I squashed every API extension of that module in one commit using that.
Each time one change needs you to edit anything because either you asked for it, or that one of the change you asked for generated a conflict, then as usual the rebase will stop. You will be prompted to make the change, or fix the conflict, or merge comments (in case of a squash), and when all is in order, you just need to:
$ git rebase --continue
This is just awsomely simple and intuitive
-
-
04 Aug 08
-
04 Jul 08
-
29 Jun 08
-
28 May 08
-
06 May 08
-
27 Apr 08
-
10 Apr 08
-
09 Apr 08
-
Mathieu MartinReorder and squash recent commits. 'git rebase --interactive' explained.
-
08 Apr 08
Would you like to comment?
Join Diigo for a free account, or sign in if you are already a member.