| commit | ff9054627c40082ad4a1cf16afebb140fcda41a2 | |
| author | Jeff King <peff@peff.net> | |
| Mon, 15 Oct 2007 04:47:30 +0000 (15 00:47 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 16 Oct 2007 05:18:43 +0000 (16 01:18 -0400) | ||
| tree | 81890a8cdc5b40f00cc6722c822ed56f704cafd4 | treesnapshot (tar.gz zip) |
| parent | 5040beff0bacac79b305fbfa4df71e99c2f13ed8 | commitdiff |
git-rebase: document suppression of duplicate commits
git-rebase uses format-patch's --ignore-if-in-upstream
option, but we never document the user-visible behavior. The
example is placed near the top of the example list rather
than at the bottom because it is:
a. a simple example
b. a reasonably common scenario for many projects (mail
some patches which get accepted upstream, then rebase)
[sp: Corrected direction of 'HEAD..<upstream>' set comparsion]
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-rebase uses format-patch's --ignore-if-in-upstream
option, but we never document the user-visible behavior. The
example is placed near the top of the example list rather
than at the bottom because it is:
a. a simple example
b. a reasonably common scenario for many projects (mail
some patches which get accepted upstream, then rebase)
[sp: Corrected direction of 'HEAD..<upstream>' set comparsion]
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| Documentation/git-rebase.txt | diffblobblamehistory |