summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-05 23:42:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-05 23:42:11 -0800
commit902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72 (patch)
treed47607e6111ba79292a3e5dcc69603139d7e0623 /rerere.c
parentMerge branch 'jk/pathspec-literal' (diff)
parentsubmodule add: If --branch is given, record it in .gitmodules (diff)
downloadtgif-902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72.tar.xz
Merge branch 'wk/submodule-update-remote'
The beginning of 'integrate with the tip of the remote branch, not the commit recorded in the superproject gitlink' support. * wk/submodule-update-remote: submodule add: If --branch is given, record it in .gitmodules submodule update: add --remote for submodule's upstream changes submodule: add get_submodule_config helper funtion
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions