summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.conf
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-06-13 12:49:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-13 12:49:50 -0700
commit7d40f89137b456820d51ebc1cbb3ffbb966e7fec (patch)
tree7df8d4af9f00ed7ebb6023405db103a29a06f326 /Documentation/user-manual.conf
parentMerge branch 'bc/solaris' (diff)
parentRename submodule.<name>.rebase to submodule.<name>.update (diff)
downloadtgif-7d40f89137b456820d51ebc1cbb3ffbb966e7fec.tar.xz
Merge branch 'ph/submodule-rebase' (early part)
* 'ph/submodule-rebase' (early part): Rename submodule.<name>.rebase to submodule.<name>.update git-submodule: add support for --rebase. Conflicts: Documentation/git-submodule.txt git-submodule.sh
Diffstat (limited to 'Documentation/user-manual.conf')
0 files changed, 0 insertions, 0 deletions