summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:48 (GMT)
commitc15fadab65907e7fa1ae3a0dd5e05b722fd1f235 (patch)
tree6576be6231027e0a0ce1cc27c00625552c944c3c /git-rebase--merge.sh
parent530d71011e358a43e8f8489e320081f49fe96c4f (diff)
parentd4a7ffaae3fa3302a73e00dab01b80c4bfd17cdb (diff)
downloadgit-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.zip
git-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.tar.gz
git-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.tar.bz2
Merge branch 'bw/cp-a-is-gnuism' into maint
* bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions