diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:51:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:51:13 -0700 |
| commit | a49eb197d809d2d7efbd81d935c61e1a0caa983e (patch) | |
| tree | 06512c227fba59faaee57dcfe1ba71f049c4d0a7 /builtin-merge.c | |
| parent | c28a17f270a51a4ed5e432e83c0ed962361a37c9 (diff) | |
| parent | 42b491786260eb17d97ea9fb1c4b70075bca9523 (diff) | |
| download | git-a49eb197d809d2d7efbd81d935c61e1a0caa983e.tar.gz git-a49eb197d809d2d7efbd81d935c61e1a0caa983e.tar.xz | |
Merge branch 'ph/submodule-rebase'
* ph/submodule-rebase:
git-submodule: add support for --merge.
Conflicts:
Documentation/git-submodule.txt
git-submodule.sh
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions