diff options
| author |  Jason McMullan <mcmullan@netapp.com> | 2007-12-05 12:16:56 -0500 |
|---|---|---|
| committer |  Simon Hausmann <simon@lst.de> | 2008-02-03 19:18:33 +0100 |
| commit | f3e9512be1c7935b8ca496f3687c6850b32a06f3 (patch) | |
| tree | bd548ce349e55593c2e19c5e34d55f711dc340a7 /Documentation/git-status.txt | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-f3e9512be1c7935b8ca496f3687c6850b32a06f3.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-status.txt')
0 files changed, 0 insertions, 0 deletions