diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:41:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:41:46 -0700 |
| commit | cd12104ab6a7fde2498bd3962a0f22699d2b9715 (patch) | |
| tree | 3377e3e5ffb09024a185383b126c4570bf6252e1 /git-merge-one-file.sh | |
| parent | Merge branch 'rr/send-email-perl-critique' into maint (diff) | |
| parent | match-trees: simplify score_trees() using tree_entry() (diff) | |
| download | tgif-cd12104ab6a7fde2498bd3962a0f22699d2b9715.tar.xz | |
Merge branch 'jk/no-more-self-assignment' into maint
* jk/no-more-self-assignment:
match-trees: simplify score_trees() using tree_entry()
submodule: clarify logic in show_submodule_summary
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions