X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=b670877510ca89bad91bed82e7527d26f2fa9248;hb=151602df00b8e5c5b4a8193f59a94b85f9b5aebc;hp=284db5dffc6605a44b08b21a677434758c63cbe5;hpb=2f60e4e9c18c4cbe1ceacad1bb975a6206ec0411;p=git.git diff --git a/.gitignore b/.gitignore index 284db5dff..b67087751 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ git-fetch git-fetch-pack git-findtags git-fmt-merge-msg +git-for-each-ref git-format-patch git-fsck-objects git-get-tar-commit-id @@ -65,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