diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:16 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:16 -0800 |
commit | 412a79f4cb5e660a2f1ba550363c20ae5f443a86 (patch) | |
tree | af666692d64a81cdb1b1e27d78b6a16a69123f71 /Documentation/merge-config.txt | |
parent | Merge branch 'tr/grep-l-with-decoration' (diff) | |
parent | submodule add: fix breakage when re-adding a deep submodule (diff) | |
download | tgif-412a79f4cb5e660a2f1ba550363c20ae5f443a86.tar.xz |
Merge branch 'jl/submodule-re-add'
* jl/submodule-re-add:
submodule add: fix breakage when re-adding a deep submodule
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions