summaryrefslogtreecommitdiff
path: root/Documentation/howto/rebase-from-internal-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-07 07:04:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-07 07:04:01 (GMT)
commita6080a0a44d5ead84db3dabbbc80e82df838533d (patch)
tree37360b8334cf8459609d1fae72f8213947858cc0 /Documentation/howto/rebase-from-internal-branch.txt
parentd44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (diff)
downloadgit-a6080a0a44d5ead84db3dabbbc80e82df838533d.zip
git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.gz
git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.bz2
War on whitespace
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/rebase-from-internal-branch.txt')
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt12
1 files changed, 5 insertions, 7 deletions
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 3b3a5c2..7a76045 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -14,10 +14,10 @@ Petr Baudis <pasky@suse.cz> writes:
> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
> where Junio C Hamano <junkio@cox.net> told me that...
>> Linus Torvalds <torvalds@osdl.org> writes:
->>
->> > Junio, maybe you want to talk about how you move patches from your "pu"
+>>
+>> > Junio, maybe you want to talk about how you move patches from your "pu"
>> > branch to the real branches.
->>
+>>
> Actually, wouldn't this be also precisely for what StGIT is intended to?
Exactly my feeling. I was sort of waiting for Catalin to speak
@@ -118,7 +118,7 @@ up your changes, along with other changes.
where *your "master" head
upstream --> #1 --> #2 --> #3
- used \
+ used \
to be \--> #A --> #2' --> #3' --> #B --> #C
*upstream head
@@ -133,7 +133,7 @@ You fetch from upstream, but not merge.
$ git fetch upstream
This leaves the updated upstream head in .git/FETCH_HEAD but
-does not touch your .git/HEAD nor .git/refs/heads/master.
+does not touch your .git/HEAD nor .git/refs/heads/master.
You run "git rebase" now.
$ git rebase FETCH_HEAD master
@@ -161,5 +161,3 @@ the #1' commit.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
-
-