X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fhowto%2Frebase-from-internal-branch.txt;h=b2c021d91723de411163a8379a017c594362beda;hb=a489352e3d1d861237729385f9afc5950bcfa6a0;hp=f627e4271c40fc2c4b28f825828e205b2fc8cb88;hpb=f358c10f91889b1b75edc257fb45c20b583baf28;p=git.git diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt index f627e427..b2c021d9 100644 --- a/Documentation/howto/rebase-from-internal-branch.txt +++ b/Documentation/howto/rebase-from-internal-branch.txt @@ -38,7 +38,7 @@ ancestry graph looked like this: So I started from master, made a bunch of edits, and committed: $ git checkout master - $ cd Documentation; ed git.txt git-apply-patch-script.txt ... + $ cd Documentation; ed git.txt ... $ cd ..; git add Documentation/*.txt $ git commit -s -v @@ -111,7 +111,7 @@ prepare #2 and #3 for e-mail submission. This creates two files, 0001-XXXX.txt and 0002-XXXX.txt. Send them out "To: " your project maintainer and "Cc: " your mailing -list. You could use contributed script git-send-email-script if +list. You could use contributed script git-send-email if your host has necessary perl modules for this, but your usual MUA would do as long as it does not corrupt whitespaces in the patch.