summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 21:24:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-11 21:24:56 (GMT)
commitf2b4626d9e78e00d2168a8470633d6c7f5331a13 (patch)
tree7370ee5177437baf37b4a2e169773310238d5d7c /builtin/merge-base.c
parent362de916c06521205276acb7f51c99f47db94727 (diff)
parentb3b8ceb48b7d75631a8638f1dc6ccdf7f1b53888 (diff)
downloadgit-f2b4626d9e78e00d2168a8470633d6c7f5331a13.zip
git-f2b4626d9e78e00d2168a8470633d6c7f5331a13.tar.gz
git-f2b4626d9e78e00d2168a8470633d6c7f5331a13.tar.bz2
Merge branch 'maint-1.8.2' into maint
* maint-1.8.2: t0070 "mktemp to unwritable directory" needs SANITY pre-push.sample: Make the script executable
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions