diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-26 23:44:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 23:44:28 -0800 |
| commit | ac93bfc3b64a8a3756263ecdadad3e7a117be597 (patch) | |
| tree | 83ee665768a654e556684fcf1d8a25b09819aaec /.gitignore | |
| parent | Merge branch 'master' into next (diff) | |
| parent | add clean and ignore rules for xdiff/ (diff) | |
| download | tgif-ac93bfc3b64a8a3756263ecdadad3e7a117be597.tar.xz | |
Merge branch 'lt/diffgen' into next
* lt/diffgen:
add clean and ignore rules for xdiff/
Remove dependency on a file named "-lz"
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index b4355b9faf..75891c393b 100644 --- a/.gitignore +++ b/.gitignore @@ -128,8 +128,7 @@ common-cmds.h *.deb git-core.spec *.exe -libgit.a -*.o +*.[ao] *.py[co] config.mak git-blame |