summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-02-21 12:01:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-21 12:01:06 -0800
commit241b9254e1c8ff071d8054f8b6fbe1883b389d69 (patch)
tree73c6c9da005ffbd2abd2b05f92347fd5c7b0796d /Documentation/merge-strategies.txt
parentMerge branch 'tc/maint-transport-ls-remote-with-void' (diff)
parentgrep documentation: clarify what files match (diff)
downloadtgif-241b9254e1c8ff071d8054f8b6fbe1883b389d69.tar.xz
Merge branch 'ml/maint-grep-doc'
* ml/maint-grep-doc: grep documentation: clarify what files match
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions