summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-base.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:54:23 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:54:23 -0700
commit566487c8a617c12d68bf22c7078bce0b94fc8121 (patch)
treea0937604a02425fc618e2d2017f4266ca9240052 /Documentation/git-merge-base.txt
parentec73962d8e17e89ac0c4b21f07cefe16594e07a2 (diff)
parentae3858e7e9146208f1608445975e2761c9b0482e (diff)
downloadgit-566487c8a617c12d68bf22c7078bce0b94fc8121.tar.gz
Merge my and Petr's git-merge-one-file-script modifications
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions