summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-30 17:19:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-30 17:19:07 -0700
commite7e55483439b2e1f483e3753109a433f2fba1a26 (patch)
treed23cefa5a370522e35e6bfcd54cee5c62bf390a4 /Documentation/git-merge-file.txt
parentt915{0,1}: use $TEST_DIRECTORY (diff)
parentclone: detect extra arguments (diff)
downloadtgif-e7e55483439b2e1f483e3753109a433f2fba1a26.tar.xz
Merge branch 'maint'
* maint: clone: detect extra arguments clone: fix help on options push: fix typo in usage More precise description of 'git describe --abbrev'
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions