summaryrefslogtreecommitdiff
path: root/git-merge-one-file-script
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 07:12:18 -0700
committerLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 07:12:18 -0700
commit705acc5c943e1147e552daf613c679c07b9772d9 (patch)
tree95619db3af4d1d6c8c967e35cb2e4ad76927cfd5 /git-merge-one-file-script
parentsha1_file: make the new sha1 object writing be coda-friendly. (diff)
downloadtgif-705acc5c943e1147e552daf613c679c07b9772d9.tar.xz
git-pull-script: add a final "diffstat" to show the result of the merge.
This is useful to verify that you got the right thing.
Diffstat (limited to 'git-merge-one-file-script')
0 files changed, 0 insertions, 0 deletions