![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jason McMullan <mcmullan@netapp.com> | |
| Wed, 5 Dec 2007 17:16:56 +0000 (12:16 -0500) | ||
| committer | Simon Hausmann <simon@lst.de> | |
| Sun, 3 Feb 2008 18:18:33 +0000 (19:18 +0100) | ||
| commit | f3e9512be1c7935b8ca496f3687c6850b32a06f3 | |
| tree | bd548ce349e55593c2e19c5e34d55f711dc340a7 | tree | snapshot |
| parent | d8534adac756a71a897b3a433eaea7992a137b71 | commit | diff |
Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
This patch removes the '$Keyword: ...$' '...' data, so that files
don't have spurious megre conflicts between branches.
Handles both +ko and +k styles, and leaves the '$Foo$' in
the original file.
Signed-off-by: Simon Hausmann <simon@lst.de>
This patch removes the '$Keyword: ...$' '...' data, so that files
don't have spurious megre conflicts between branches.
Handles both +ko and +k styles, and leaves the '$Foo$' in
the original file.
Signed-off-by: Simon Hausmann <simon@lst.de>
| contrib/fast-import/git-p4 | diff | blob | history |