summaryrefslogtreecommitdiffstats
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-06 00:07:54 +0100
committerJunio C Hamano <gitster@pobox.com>2011-12-06 00:07:54 +0100
commitb1af9630d758e1728fc0008b3f18d90d8f87f4c5 (patch)
tree4e6a10fae8310dbc6d88899791e94f99a5608cea /git-am.sh
parentMerge branch 'js/merge-edit-option' (diff)
parentMerge branch 'maint-1.7.6' into maint-1.7.7 (diff)
downloadgit-b1af9630d758e1728fc0008b3f18d90d8f87f4c5.tar.xz
git-b1af9630d758e1728fc0008b3f18d90d8f87f4c5.zip
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: stripspace: fix outdated comment Add MYMETA.yml to perl/.gitignore
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions