diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:31:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:31:11 -0800 |
| commit | af526de90ca1ae1baf039f161cf9597d3ef379d4 (patch) | |
| tree | dad79dcf0f59b82ce27917379086a09d7e42b094 /builtin-merge.c | |
| parent | Merge branch 'jp/dirty-describe' (diff) | |
| parent | gitignore: root most patterns at the top-level directory (diff) | |
| download | git-af526de90ca1ae1baf039f161cf9597d3ef379d4.tar.gz git-af526de90ca1ae1baf039f161cf9597d3ef379d4.zip | |
Merge branch 'jk/gitignore-anchored'
* jk/gitignore-anchored:
gitignore: root most patterns at the top-level directory
Conflicts:
.gitignore
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions