projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trivial: clarify, what are the config's user.name and user.email about
[git.git]
/
Documentation
/
howto
/
rebase-and-edit.txt
diff --git
a/Documentation/howto/rebase-and-edit.txt
b/Documentation/howto/rebase-and-edit.txt
index
8299ca5
..
646c55c
100644
(file)
--- a/
Documentation/howto/rebase-and-edit.txt
+++ b/
Documentation/howto/rebase-and-edit.txt
@@
-3,6
+3,9
@@
From: Linus Torvalds <torvalds@osdl.org>
To: Steve French <smfrench@austin.rr.com>
cc: git@vger.kernel.org
Subject: Re: sending changesets from the middle of a git tree
To: Steve French <smfrench@austin.rr.com>
cc: git@vger.kernel.org
Subject: Re: sending changesets from the middle of a git tree
+Abstract: In this article, Linus demonstrates how a broken commit
+ in a sequence of commits can be removed by rewinding the head and
+ reapplying selected changes.
On Sat, 13 Aug 2005, Linus Torvalds wrote:
On Sat, 13 Aug 2005, Linus Torvalds wrote:
@@
-60,7
+63,7
@@
And then, you can just remove the broken branch if you decide you really
don't want it:
# remove 'broken' branch
don't want it:
# remove 'broken' branch
-
rm .git/refs/heads/
broken
+
git branch -d
broken
# Prune old objects if you're really really sure
git prune
# Prune old objects if you're really really sure
git prune