diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-05 16:58:13 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-06 12:49:16 -0700 |
| commit | 9840906026be807d0882f96396de3a3cdb9fb43e (patch) | |
| tree | e9660a07d70a1ccb7804e275f106d9e3525330f1 /commit.c | |
| parent | filter-branch: use $(($i+1)) instead of $((i+1)) (diff) | |
| download | git-9840906026be807d0882f96396de3a3cdb9fb43e.tar.gz git-9840906026be807d0882f96396de3a3cdb9fb43e.zip | |
filter-branch: fix behaviour of '-k'
The option '-k' says that the given commit and _all_ of its ancestors
are kept as-is.
However, if a to-be-rewritten commit branched from an ancestor of an
ancestor of a commit given with '-k', filter-branch would fail.
Example:
A - B
\
C
If filter-branch was called with '-k B -s C', it would actually keep
B (and A as its parent), but would rewrite C, and its parent.
Noticed by Johannes Sixt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions