projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-merge: Exit with code 2 if no strategy was able to handle the merge.
[git.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
328b399
..
8a6bd02
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-42,7
+42,7
@@
git-index-pack
git-init-db
git-local-fetch
git-log
-git-lost
+
found
+git-lost
-
found
git-ls-files
git-ls-remote
git-ls-tree
@@
-74,8
+74,8
@@
git-read-tree
git-rebase
git-receive-pack
git-relink
-git-rename
git-repack
+git-repo-config
git-request-pull
git-reset
git-resolve