diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-08-03 16:17:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-03 16:17:51 -0700 |
| commit | c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9 (patch) | |
| tree | b521e9e696ce211f42d5c5795b600b8a38134e88 /.gitignore | |
| parent | merge-recur: virtual commits shall never be parsed (diff) | |
| download | tgif-c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9.tar.xz | |
.gitignore: git-merge-recur is a built file.
Also it is OK to omit the documentation for it at least for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index fb0fa3f16a..2299e36ba9 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,7 @@ git-merge-tree git-merge-octopus git-merge-one-file git-merge-ours +git-merge-recur git-merge-recursive git-merge-resolve git-merge-stupid |