On Wed, Jan 13, 2016 at 10:40 AM, Stefan Haller <lists@xxxxxxxxxxxxxxxx> wrote: > Robert Dailey <rcdailey.lists@xxxxxxxxx> wrote: > >> On Mon, Jan 11, 2016 at 8:11 AM, Stefan Haller <lists@xxxxxxxxxxxxxxxx> wrote: >> > Robert Dailey <rcdailey.lists@xxxxxxxxx> wrote: >> > >> >> Normally to add commits on my branch, I perform an interactive rebase: >> >> >> >> $ git rebase -i origin/master >> >> >> >> I mark the commit I want to put the new commit on top of as 'edit'. >> >> However, if I want to add a commit to the front of my branch, I don't >> >> really have a commit to mark as "edit". >> > >> > Instead of marking commits as edit, I usually add "x false" at the place >> > where I want to add a commit. With this I find it easier to see where >> > the new commit goes, and it also works before the first commit. >> >> What do you mean "x false"? I'm not familiar with this. Can you explain? > > "x" is a shorthand for "exec" (just like "p" is a shorthand for "pick", > for instance). "exec" will execute an arbitrary shell command, and stop > when that shell command fails with an exit code not equal to zero. > "false" is a shell command that does nothing except return a non-zero > exit code, so "x false" just stops and waits for you to "fix" something. > At that point you can make additional commits, and then "git rebase > --continue" to go on. Oh, this is pretty neat! So I assume it will stop BEFORE a patch is applied, unlike edit? I will try this next time. However it would be great to see a new 'insert' command for the TODO file, that will let you insert a commit at that point (i.e. it stops before the marked commit is applied). Thanks for the help. -- 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