X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=4c8c8e411500fe2ed0108c46838d50576ed15185;hb=1974bf620b436b014bfe86179ff76485610a4887;hp=0ffe14ac4eb85ff88b3b09c50584c6a6c2c4d794;hpb=e9800b28c24465377dc2b8e26b322d362912647c;p=git.git diff --git a/.gitignore b/.gitignore index 0ffe14ac4..4c8c8e411 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ git-merge-one-file git-merge-ours git-merge-recur git-merge-recursive +git-merge-recursive-old git-merge-resolve git-merge-stupid git-mktag @@ -125,13 +126,11 @@ git-update-ref git-update-server-info git-upload-archive git-upload-pack -git-upload-tar git-var git-verify-pack git-verify-tag git-whatchanged git-write-tree -git-zip-tree git-core-*/?* gitweb/gitweb.cgi test-date