diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:38:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:38:16 -0800 |
| commit | 4b5f94cdde41a58ac893c0bfb3e04f235e53f9dc (patch) | |
| tree | 753b908286360b4f0f7c7e3af560cfb601c9b905 /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'jn/cherry-pick-refresh-index' into maint (diff) | |
| parent | Documentation: point to related commands from gitignore (diff) | |
| download | tgif-4b5f94cdde41a58ac893c0bfb3e04f235e53f9dc.tar.xz | |
Merge branch 'jn/ignore-doc' into maint
* jn/ignore-doc:
Documentation: point to related commands from gitignore
Documentation: split gitignore page into sections
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions