diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-10 19:13:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 19:13:46 (GMT) |
| commit | 055e1e29696c0fb06582c1592ee6b58643dcc514 (patch) | |
| tree | c02d254d4cd428587da4556b16c550434b09f369 /Documentation/git-merge-tree.txt | |
| parent | 3b0c19663e7976cd32188b42e762c980d1bb93d4 (diff) | |
| parent | eee49b6ce4b7b3fed28794676c67ad3609f658ac (diff) | |
| download | git-055e1e29696c0fb06582c1592ee6b58643dcc514.zip git-055e1e29696c0fb06582c1592ee6b58643dcc514.tar.gz git-055e1e29696c0fb06582c1592ee6b58643dcc514.tar.bz2 | |
Merge branch 'jl/maint-submodule-gitfile-awareness'
* jl/maint-submodule-gitfile-awareness:
Teach diff --submodule and status to handle .git files in submodules
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions